AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some remaining SK_GRAPHITE_ENABLED defines.

Browse Source 
Change-Id: I7a4cd8e2c629ba53e40adc379ea92f86f70d11da
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/549857
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Auto-Submit: Jim Van Verth <jvanverth@google.com>
This commit is contained in:
Jim Van Verth 2022-06-14 11:55:16 -04:00 committed by SkCQ
parent f3e875b263
commit 6ed17ef4c5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/core/SkImage.h
View File

@ -18,7 +18,7 @@
#if SK_SUPPORT_GPU #if SK_SUPPORT_GPU
#include "include/gpu/GrTypes.h" #include "include/gpu/GrTypes.h"
#endif #endif
#if SK_GRAPHITE_ENABLED #if defined(SK_GRAPHITE_ENABLED)
#include "include/gpu/graphite/GraphiteTypes.h" #include "include/gpu/graphite/GraphiteTypes.h"
#endif #endif
#include <functional> // std::function #include <functional> // std::function
@ -50,7 +50,7 @@ class SkYUVAPixmaps;
enum class SkEncodedImageFormat; enum class SkEncodedImageFormat;
#if SK_GRAPHITE_ENABLED #if defined(SK_GRAPHITE_ENABLED)
namespace skgpu::graphite { namespace skgpu::graphite {
class Recorder; class Recorder;
}; };

2
tools/ToolUtils.cpp
View File

@ -544,7 +544,7 @@ sk_sp<SkImage> MakeTextureImage(SkCanvas* canvas, sk_sp<SkImage> orig) {
return orig->makeTextureImage(dContext); return orig->makeTextureImage(dContext);
} }
#if SK_GRAPHITE_ENABLED #if defined(SK_GRAPHITE_ENABLED)
else if (canvas->recorder()) { else if (canvas->recorder()) {
return orig->makeTextureImage(canvas->recorder()); return orig->makeTextureImage(canvas->recorder());
} }

2
tools/sk_app/WindowContext.h
View File

@ -58,7 +58,7 @@ protected:
virtual bool isGpuContext() { return true; } virtual bool isGpuContext() { return true; }
sk_sp<GrDirectContext> fContext; sk_sp<GrDirectContext> fContext;
#if SK_GRAPHITE_ENABLED #if defined(SK_GRAPHITE_ENABLED)
std::unique_ptr<skgpu::graphite::Context> fGraphiteContext; std::unique_ptr<skgpu::graphite::Context> fGraphiteContext;
std::unique_ptr<skgpu::graphite::Recorder> fGraphiteRecorder; std::unique_ptr<skgpu::graphite::Recorder> fGraphiteRecorder;
#endif #endif