external/skia/fix-graphite-ifdef.patch.1

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