diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
| commit | ed5640d8b587fbcfed7dd7967f3de04b37a76f26 (patch) | |
| tree | 7a5f7c6c9d02226d7471cb3cc8fbbf631b415303 /external/skia/fix-graphite-ifdef.patch.1 | |
| parent | Initial commit. (diff) | |
| download | libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.tar.xz libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.zip | |
Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/skia/fix-graphite-ifdef.patch.1')
| -rw-r--r-- | external/skia/fix-graphite-ifdef.patch.1 | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/external/skia/fix-graphite-ifdef.patch.1 b/external/skia/fix-graphite-ifdef.patch.1 new file mode 100644 index 000000000..4ed2ff252 --- /dev/null +++ b/external/skia/fix-graphite-ifdef.patch.1 @@ -0,0 +1,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 |