external/skia/fix-pch.patch.1

   1 diff --git a/include/core/SkColor.h b/include/core/SkColor.h
   2 index 9cba771ddd..6d324b75d0 100644
   3 --- a/include/core/SkColor.h
   4 +++ b/include/core/SkColor.h
   5 @@ -420,6 +420,7 @@ using SkColor4f = SkRGBA4f<kUnpremul_SkAlphaType>;
   6
   7  template <> SK_API SkColor4f SkColor4f::FromColor(SkColor);
   8  template <> SK_API SkColor   SkColor4f::toSkColor() const;
   9 +template <> uint32_t SkColor4f::toBytes_RGBA() const;
  10
  11  namespace SkColors {
  12  constexpr SkColor4f kTransparent = {0, 0, 0, 0};
  13 diff --git a/include/private/SkColorData.h b/include/private/SkColorData.h
  14 index aba610eacf..792da4e9fb 100644
  15 --- a/include/private/SkColorData.h
  16 +++ b/include/private/SkColorData.h
  17 @@ -442,4 +442,6 @@ constexpr SkPMColor4f SK_PMColor4fILLEGAL = { SK_FloatNegativeInfinity,
  18                                                SK_FloatNegativeInfinity,
  19                                                SK_FloatNegativeInfinity };
  20
  21 +template <> uint32_t SkPMColor4f::toBytes_RGBA() const;
  22 +
  23  #endif
  24 diff --git a/src/core/SkM44.cpp b/src/core/SkM44.cpp
  25 index 248917423f..3d0bc00307 100644
  26 --- a/src/core/SkM44.cpp
  27 +++ b/src/core/SkM44.cpp
  28 @@ -283,6 +283,8 @@ SkM44 Sk3LookAt(const SkV3& eye, const SkV3& center, const SkV3& up) {
  29      return m;
  30  }
  31
  32 +#undef near
  33 +#undef far
  34  SkM44 Sk3Perspective(float near, float far, float angle) {
  35      SkASSERT(far > near);
  36
  37 diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
  38 index 76f69754c6..01ce4a1e2d 100644
  39 --- a/src/gpu/gl/GrGLGpu.cpp
  40 +++ b/src/gpu/gl/GrGLGpu.cpp
  41 @@ -3531,6 +3531,8 @@ void GrGLGpu::xferBarrier(GrRenderTarget* rt, GrXferBarrierType type) {
  42      }
  43  }
  44
  45 +#undef MemoryBarrier
  46 +
  47  void GrGLGpu::insertManualFramebufferBarrier() {
  48      SkASSERT(this->caps()->requiresManualFBBarrierAfterTessellatedStencilDraw());
  49      GL_CALL(MemoryBarrier(GR_GL_FRAMEBUFFER_BARRIER_BIT));
  50 diff --git a/src/gpu/text/GrTextBlobCache.h b/src/gpu/text/GrTextBlobCache.h
  51 index c973384081..8943198ddd 100644
  52 --- a/src/gpu/text/GrTextBlobCache.h
  53 +++ b/src/gpu/text/GrTextBlobCache.h
  54 @@ -91,4 +91,6 @@ private:
  55      SkMessageBus<PurgeBlobMessage>::Inbox fPurgeBlobInbox SK_GUARDED_BY(fSpinLock);
  56  };
  57
  58 +template<> SkMessageBus<GrTextBlobCache::PurgeBlobMessage>* SkMessageBus<GrTextBlobCache::PurgeBlobMessage>::Get();
  59 +
  60  #endif
  61 diff --git a/src/gpu/vk/GrVkSemaphore.cpp b/src/gpu/vk/GrVkSemaphore.cpp
  62 index 23bf656bf8..f926ebfdc2 100644
  63 --- a/src/gpu/vk/GrVkSemaphore.cpp
  64 +++ b/src/gpu/vk/GrVkSemaphore.cpp
  65 @@ -10,6 +10,7 @@
  66  #include "include/gpu/GrBackendSemaphore.h"
  67  #include "src/gpu/vk/GrVkGpu.h"
  68  #include "src/gpu/vk/GrVkUtil.h"
  69 +#include "tools/gpu/vk/GrVulkanDefines.h"
  70
  71  #ifdef VK_USE_PLATFORM_WIN32_KHR
  72  // windows wants to define this as CreateSemaphoreA or CreateSemaphoreW
  73 diff --git a/src/utils/win/SkDWriteGeometrySink.h b/src/utils/win/SkDWriteGeometrySink.h
  74 index af4909aaaf..825ec35c83 100644
  75 --- a/src/utils/win/SkDWriteGeometrySink.h
  76 +++ b/src/utils/win/SkDWriteGeometrySink.h
  77 @@ -13,6 +13,8 @@
  78
  79  class SkPath;
  80
  81 +#define CONST const
  82 +
  83  #include <dwrite.h>
  84  #include <d2d1.h>
  85
  86 diff --git a/third_party/skcms/skcms.cc b/third_party/skcms/skcms.cc
  87 index 4f983439b9..f6fc53c91a 100644
  88 --- a/third_party/skcms/skcms.cc
  89 +++ b/third_party/skcms/skcms.cc
  90 @@ -130,7 +130,8 @@ static float minus_1_ulp(float x) {
  91  // Most transfer functions we work with are sRGBish.
  92  // For exotic HDR transfer functions, we encode them using a tf.g that makes no sense,
  93  // and repurpose the other fields to hold the parameters of the HDR functions.
  94 -enum TFKind { Bad, sRGBish, PQish, HLGish, HLGinvish };
  95 +enum TFKind_skcms { Bad, sRGBish, PQish, HLGish, HLGinvish };
  96 +#define TFKind TFKind_skcms
  97  struct TF_PQish  { float A,B,C,D,E,F; };
  98  struct TF_HLGish { float R,G,a,b,c,K_minus_1; };
  99  // We didn't originally support a scale factor K for HLG, and instead just stored 0 in
 100 @@ -2059,7 +2060,9 @@ typedef enum {
 101      Op_store_hhhh,
 102      Op_store_fff,
 103      Op_store_ffff,
 104 -} Op;
 105 +} Op_skcms;
 106 +
 107 +#define Op Op_skcms
 108
 109  #if defined(__clang__)
 110      template <int N, typename T> using Vec = T __attribute__((ext_vector_type(N)));