external/skia/fix-pch.patch.1

   1 diff --git a/include/private/SkColorData.h b/include/private/SkColorData.h
   2 index a59e7b0446..960b4c0313 100644
   3 --- a/include/private/SkColorData.h
   4 +++ b/include/private/SkColorData.h
   5 @@ -438,4 +438,6 @@ constexpr SkPMColor4f SK_PMColor4fILLEGAL = { SK_FloatNegativeInfinity,
   6                                                SK_FloatNegativeInfinity,
   7                                                SK_FloatNegativeInfinity };
   8
   9 +template <> uint32_t SkPMColor4f::toBytes_RGBA() const;
  10 +
  11  #endif
  12 diff --git a/src/core/SkM44.cpp b/src/core/SkM44.cpp
  13 index 02b1741763..4cece999d2 100644
  14 --- a/src/core/SkM44.cpp
  15 +++ b/src/core/SkM44.cpp
  16 @@ -341,6 +341,8 @@ SkM44 SkM44::LookAt(const SkV3& eye, const SkV3& center, const SkV3& up) {
  17      return m;
  18  }
  19
  20 +#undef near
  21 +#undef far
  22  SkM44 SkM44::Perspective(float near, float far, float angle) {
  23      SkASSERT(far > near);
  24
  25 diff --git a/src/gpu/ganesh/vk/GrVkSemaphore.cpp b/src/gpu/ganesh/vk/GrVkSemaphore.cpp
  26 index 70c7f0ea80..ab8319a447 100644
  27 --- a/src/gpu/ganesh/vk/GrVkSemaphore.cpp
  28 +++ b/src/gpu/ganesh/vk/GrVkSemaphore.cpp
  29 @@ -10,6 +10,7 @@
  30  #include "include/gpu/GrBackendSemaphore.h"
  31  #include "src/gpu/ganesh/vk/GrVkGpu.h"
  32  #include "src/gpu/ganesh/vk/GrVkUtil.h"
  33 +#include "tools/gpu/vk/GrVulkanDefines.h"
  34
  35  #ifdef VK_USE_PLATFORM_WIN32_KHR
  36  // windows wants to define this as CreateSemaphoreA or CreateSemaphoreW
  37 diff --git a/src/sksl/ir/SkSLPoison.h b/src/sksl/ir/SkSLPoison.h
  38 index 035f94e1f6..3cf12db902 100644
  39 --- a/src/sksl/ir/SkSLPoison.h
  40 +++ b/src/sksl/ir/SkSLPoison.h
  41 @@ -5,6 +5,9 @@
  42   * found in the LICENSE file.
  43   */
  44
  45 +#ifndef SKSL_POISON
  46 +#define SKSL_POISON
  47 +
  48  #include "src/sksl/SkSLBuiltinTypes.h"
  49  #include "src/sksl/SkSLCompiler.h"
  50  #include "src/sksl/SkSLContext.h"
  51 @@ -38,3 +41,5 @@ private:
  52  };
  53
  54  } // namespace SkSL
  55 +
  56 +#endif
  57 diff --git a/src/utils/win/SkDWriteGeometrySink.h b/src/utils/win/SkDWriteGeometrySink.h
  58 index af4909aaaf..825ec35c83 100644
  59 --- a/src/utils/win/SkDWriteGeometrySink.h
  60 +++ b/src/utils/win/SkDWriteGeometrySink.h
  61 @@ -13,6 +13,8 @@
  62
  63  class SkPath;
  64
  65 +#define CONST const
  66 +
  67  #include <dwrite.h>
  68  #include <d2d1.h>
  69
  70 diff --git a/modules/skcms/skcms.cc b/modules/skcms/skcms.cc
  71 index 1b643f45cf..c1981110da 100644
  72 --- a/modules/skcms/skcms.cc
  73 +++ b/modules/skcms/skcms.cc
  74 @@ -2371,7 +2372,9 @@ typedef enum {
  75      Op_store_hhhh,
  76      Op_store_fff,
  77      Op_store_ffff,
  78 -} Op;
  79 +} Op_skcms;
  80 +
  81 +#define Op Op_skcms
  82
  83  #if defined(__clang__)
  84      template <int N, typename T> using Vec = T __attribute__((ext_vector_type(N)));