blob: 4ed2ff2527b44a0fc5a366b46e09328c12f9a1d6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index 9ca9317408..fee18fe58c 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -17,7 +17,7 @@
#if SK_SUPPORT_GPU
#include "include/gpu/GrTypes.h"
#endif
-#if SK_GRAPHITE_ENABLED
+#ifdef SK_GRAPHITE_ENABLED
#include "include/gpu/graphite/GraphiteTypes.h"
#endif
#include <functional> // std::function
@@ -49,7 +49,7 @@ class SkYUVAPixmaps;
enum class SkEncodedImageFormat;
-#if SK_GRAPHITE_ENABLED
+#ifdef SK_GRAPHITE_ENABLED
namespace skgpu::graphite {
class Recorder;
};
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 5301361a2b..8adaf3ac09 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -236,7 +236,7 @@
# define SK_SUPPORT_GPU 1
#endif
-#if SK_SUPPORT_GPU || SK_GRAPHITE_ENABLED
+#if SK_SUPPORT_GPU || defined(SK_GRAPHITE_ENABLED)
# if !defined(SK_ENABLE_SKSL)
# define SK_ENABLE_SKSL
# endif
diff --git a/tools/sk_app/WindowContext.h b/tools/sk_app/WindowContext.h
index 65ab8b9aa4..c1bc7fb03a 100644
--- a/tools/sk_app/WindowContext.h
+++ b/tools/sk_app/WindowContext.h
@@ -58,7 +58,7 @@ protected:
virtual bool isGpuContext() { return true; }
sk_sp<GrDirectContext> fContext;
-#if SK_GRAPHITE_ENABLED
+#ifdef SK_GRAPHITE_ENABLED
std::unique_ptr<skgpu::graphite::Context> fGraphiteContext;
std::unique_ptr<skgpu::graphite::Recorder> fGraphiteRecorder;
#endif
|
