Use SK_GANESH and SK_GRAPHITE everywhere
Did mechanical find and replaces for:
- #ifdef SK_GRAPHITE_ENABLED -> #if defined(SK_GRAPHITE)
- SK_GRAPHITE_ENABLED -> SK_GRAPHITE
- SK_GANESH_ENABLED -> SK_GANESH
Change-Id: I675eccf178182bd1f016aa2cb105ff867e2f3be0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/650116
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
(cherry picked from commit 0f7b44ea2fdaf61cc683241476bae0f9f232f7b5)
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/656239
diff --git a/BUILD.gn b/BUILD.gn
index 52f3823..9900ae3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -68,10 +68,10 @@
]
}
if (skia_enable_gpu || skia_enable_ganesh) {
- defines += [ "SK_GANESH_ENABLED" ]
+ defines += [ "SK_GANESH" ]
}
if (skia_enable_graphite) {
- defines += [ "SK_GRAPHITE_ENABLED" ]
+ defines += [ "SK_GRAPHITE" ]
}
if (skia_use_perfetto) {
defines += [ "SK_USE_PERFETTO" ]
@@ -980,7 +980,7 @@
}
optional("gpu_shared") {
- enabled = skia_enable_gpu || skia_enable_ganesh || skia_enable_graphite
+ enabled = skia_enable_ganesh || skia_enable_graphite
deps = []
libs = []
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index cfa1668..c2ae3f4 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -4,9 +4,10 @@
Milestone 113
-------------
- * The define SK_SUPPORT_GPU is now SK_GANESH_ENABLED. It is no longer detected as a 0 or 1, but
+ * The define SK_SUPPORT_GPU is now SK_GANESH. It is no longer detected as a 0 or 1, but
as the absence or presence of that define. As a result, it defaults to off (not defined) if
not defined (SK_SUPPORT_GPU would default to SK_SUPPORT_GPU=1 if not defined).
+ * SkStrSplit is no longer part of the public API.
* * *
diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp
index a2bbe9a..b19ebf7 100644
--- a/bench/ColorFilterBench.cpp
+++ b/bench/ColorFilterBench.cpp
@@ -200,7 +200,7 @@
return SkColorFilterPriv::MakeGaussian();
}); )
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
DEF_BENCH( return new ColorFilterBench("src_runtime", []() {
static sk_sp<SkRuntimeEffect> gEffect =
SkRuntimeEffect::MakeForColorFilter(SkString(RuntimeNone_GPU_SRC)).effect;
diff --git a/bench/SKPBench.cpp b/bench/SKPBench.cpp
index c68b256..81b575c 100644
--- a/bench/SKPBench.cpp
+++ b/bench/SKPBench.cpp
@@ -49,7 +49,7 @@
bounds.intersect(fPic->cullRect().roundOut());
SkAssertResult(!bounds.isEmpty());
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
const bool gpu = canvas->recordingContext() != nullptr || canvas->recorder() != nullptr;
#else
const bool gpu = canvas->recordingContext() != nullptr;
diff --git a/bench/SkSLBench.cpp b/bench/SkSLBench.cpp
index ab2e083..9e1e941 100644
--- a/bench/SkSLBench.cpp
+++ b/bench/SkSLBench.cpp
@@ -26,7 +26,7 @@
#include "src/sksl/generated/sksl_public.minified.sksl"
#include "src/sksl/generated/sksl_rt_shader.minified.sksl"
#include "src/sksl/generated/sksl_vert.minified.sksl"
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
#include "src/sksl/generated/sksl_graphite_frag.minified.sksl"
#include "src/sksl/generated/sksl_graphite_vert.minified.sksl"
#endif
@@ -529,7 +529,7 @@
bench(log, "sksl_compiler_gpu", gpuBytes);
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
// Heap used by a compiler with the Graphite modules loaded.
before = heap_bytes_used();
compiler.moduleForProgramKind(SkSL::ProgramKind::kGraphiteVertex);
@@ -559,7 +559,7 @@
std::size(SKSL_MINIFIED_sksl_rt_shader);
bench(log, "sksl_binary_size_gpu", compilerGPUBinarySize);
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
int compilerGraphiteBinarySize = std::size(SKSL_MINIFIED_sksl_graphite_frag) +
std::size(SKSL_MINIFIED_sksl_graphite_vert);
bench(log, "sksl_binary_size_graphite", compilerGraphiteBinarySize);
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 34839e8..32e336e 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -63,7 +63,7 @@
#include "client_utils/android/BitmapRegionDecoder.h"
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/Context.h"
#include "include/gpu/graphite/Recorder.h"
#include "include/gpu/graphite/Recording.h"
@@ -302,7 +302,7 @@
}
};
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
struct GraphiteTarget : public Target {
explicit GraphiteTarget(const Config& c) : Target(c) {}
using TestContext = skiatest::graphite::GraphiteTestContext;
@@ -381,7 +381,7 @@
void dumpStats() override {
}
};
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
static double time(int loops, Benchmark* bench, Target* target) {
SkCanvas* canvas = target->getCanvas();
@@ -593,7 +593,7 @@
ctxOverrides,
gpuConfig->getSurfaceFlags()};
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (const auto* gpuConfig = config->asConfigGraphite()) {
if (!FLAGS_gpu) {
SkDebugf("Skipping config '%s' as requested.\n", config->getTag().c_str());
@@ -718,7 +718,7 @@
case Benchmark::kGPU_Backend:
target = new GPUTarget(config);
break;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
case Benchmark::kGraphite_Backend:
target = new GraphiteTarget(config);
break;
diff --git a/defines.bzl b/defines.bzl
index 33ff219..3fcd127 100644
--- a/defines.bzl
+++ b/defines.bzl
@@ -59,15 +59,15 @@
GPU_DEFINES = select_multi({
"//src/gpu:gl_backend": [
"SK_GL",
- "SK_GANESH_ENABLED",
+ "SK_GANESH",
],
"//src/gpu:vulkan_backend": [
"SK_VULKAN",
- "SK_GANESH_ENABLED",
+ "SK_GANESH",
],
"//src/gpu:dawn_backend": [
"SK_DAWN",
- "SK_GANESH_ENABLED",
+ "SK_GANESH",
"VK_USE_PLATFORM_XCB_KHR", # TODO(kjlubick) support dawn's dawn_enable_vulkan etc
],
}) + select({
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 84d97bd..4b0b78b 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -985,7 +985,7 @@
}
}
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (FLAGS_graphite) {
if (const SkCommandLineConfigGraphite *graphiteConfig = config->asConfigGraphite()) {
return new GraphiteSink(graphiteConfig);
diff --git a/dm/DMGpuTestProcs.cpp b/dm/DMGpuTestProcs.cpp
index 4ccc335..bf4805b 100644
--- a/dm/DMGpuTestProcs.cpp
+++ b/dm/DMGpuTestProcs.cpp
@@ -12,7 +12,7 @@
#include "include/gpu/GrDirectContext.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/Context.h"
#include "tools/graphite/ContextFactory.h"
#endif
@@ -88,7 +88,7 @@
}
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
namespace graphite {
@@ -113,6 +113,6 @@
} // namespace graphite
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
} // namespace skiatest
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 3d81333..78b383c 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -82,7 +82,7 @@
#include "src/xml/SkXMLWriter.h"
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/Context.h"
#include "include/gpu/graphite/Recorder.h"
#include "include/gpu/graphite/Recording.h"
@@ -1098,12 +1098,12 @@
struct DeserializationContext {
GrDirectContext* fDirectContext = nullptr;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
skgpu::graphite::Recorder* fRecorder = nullptr;
#endif
} ctx {
GrAsDirectContext(canvas->recordingContext()),
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
canvas->recorder()
#endif
};
@@ -2096,7 +2096,7 @@
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
GraphiteSink::GraphiteSink(const SkCommandLineConfigGraphite* config)
: fContextType(config->getContextType())
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index c3be192..f0e8e50 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -580,7 +580,7 @@
int fPageIndex;
};
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
class GraphiteSink : public Sink {
public:
diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp
index 765b329..a153a89 100644
--- a/fuzz/FuzzCanvas.cpp
+++ b/fuzz/FuzzCanvas.cpp
@@ -46,7 +46,7 @@
#include "tools/debugger/DebugCanvas.h"
#include "tools/flags/CommandLineFlags.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrDirectContext.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "tools/gpu/GrContextFactory.h"
@@ -1608,7 +1608,7 @@
canvas.restore();
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
static void fuzz_ganesh(Fuzz* fuzz, GrDirectContext* context) {
SkASSERT(context);
auto surface = SkSurface::MakeRenderTarget(
diff --git a/gm/discard.cpp b/gm/discard.cpp
index a43ccf9..87ea4a9 100644
--- a/gm/discard.cpp
+++ b/gm/discard.cpp
@@ -54,7 +54,7 @@
surface = SkSurface::MakeRenderTarget(dContext, skgpu::Budgeted::kNo, info);
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
auto recorder = canvas->recorder();
if (recorder) {
surface = SkSurface::MakeGraphite(recorder, info);
diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp
index 07400c9..9228901 100644
--- a/gm/drawbitmaprect.cpp
+++ b/gm/drawbitmaprect.cpp
@@ -147,7 +147,7 @@
if (sk_sp<SkImage> subset = image->makeSubset(srcR, direct)) {
canvas->drawImageRect(subset, dstR, sampling, paint);
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (sk_sp<SkImage> subset = image->makeSubset(srcR, canvas->recorder())) {
canvas->drawImageRect(subset, dstR, sampling, paint);
}
diff --git a/gm/graphite_replay.cpp b/gm/graphite_replay.cpp
index 1918e37..8a177fd 100644
--- a/gm/graphite_replay.cpp
+++ b/gm/graphite_replay.cpp
@@ -13,7 +13,7 @@
#include "tools/Resources.h"
#include "tools/ToolUtils.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/Context.h"
#include "include/gpu/graphite/Recorder.h"
#include "include/gpu/graphite/Recording.h"
@@ -42,7 +42,7 @@
}
DrawResult onDraw(SkCanvas* canvas, SkString* errorMsg) override {
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
skgpu::graphite::Recorder* recorder = canvas->recorder();
if (recorder) {
this->drawGraphite(canvas, recorder);
@@ -96,7 +96,7 @@
canvas->restore();
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void drawGraphite(SkCanvas* canvas, skgpu::graphite::Recorder* canvasRecorder) {
SkImageInfo tileImageInfo =
canvas->imageInfo().makeDimensions(SkISize::Make(kTileWidth, kTileHeight));
diff --git a/gm/graphitestart.cpp b/gm/graphitestart.cpp
index 7b54be5..91910a1 100644
--- a/gm/graphitestart.cpp
+++ b/gm/graphitestart.cpp
@@ -327,7 +327,7 @@
canvas->restore();
// Bottom-left corner
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
// TODO: failing serialize test on Linux, not sure what's going on
canvas->writePixels(fBitmap, 0, 2*kTileHeight);
#endif
diff --git a/gm/image.cpp b/gm/image.cpp
index 8a31af3..1a01435 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -311,7 +311,7 @@
GrDirectContext* dContext = GrAsDirectContext(canvas->recordingContext());
bool isGPU = SkToBool(dContext);
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
skgpu::graphite::Recorder* recorder = canvas->recorder();
isGPU = isGPU || SkToBool(recorder);
#endif
@@ -376,7 +376,7 @@
if (dContext) {
surface = SkSurface::MakeRenderTarget(dContext, skgpu::Budgeted::kYes, ii);
} else {
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
surface = SkSurface::MakeGraphite(recorder, ii);
#endif
}
@@ -399,7 +399,7 @@
texImage = image->makeTextureImage(dContext,
mm ? GrMipmapped::kYes : GrMipmapped::kNo);
} else {
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
texImage = image->makeTextureImage(recorder,
{ mm ? skgpu::Mipmapped::kYes
: skgpu::Mipmapped::kNo });
@@ -486,7 +486,7 @@
}
GrDirectContext* dContext = GrAsDirectContext(canvas->recordingContext());
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
auto recorder = canvas->recorder();
#endif
@@ -494,7 +494,7 @@
sk_sp<SkImage> subset;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (recorder) {
subset = img->makeSubset({100, 100, 200, 200}, recorder);
} else
diff --git a/gm/image_pict.cpp b/gm/image_pict.cpp
index 10f6c73..70886df 100644
--- a/gm/image_pict.cpp
+++ b/gm/image_pict.cpp
@@ -174,7 +174,7 @@
surface = SkSurface::MakeRenderTarget(fRContext.get(), skgpu::Budgeted::kYes, info,
0, kTopLeft_GrSurfaceOrigin, nullptr);
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (skgpu::graphite::Recorder* recorder = canvas->recorder()) {
surface = SkSurface::MakeGraphite(recorder, info);
}
@@ -220,7 +220,7 @@
/*label=*/"SurfaceProxyView_GenerateTexture");
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
sk_sp<SkImage> onMakeTextureImage(skgpu::graphite::Recorder*,
const SkImageInfo&,
skgpu::Mipmapped) override {
@@ -304,7 +304,7 @@
fImageSubset = SkImage::MakeFromGenerator(std::move(gen))->makeSubset(subset,
dContext);
} else {
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
auto recorder = canvas->recorder();
fImageSubset = SkImage::MakeFromGenerator(std::move(gen))->makeSubset(subset,
recorder);
diff --git a/gm/imagemasksubset.cpp b/gm/imagemasksubset.cpp
index edd742d..9023d7b 100644
--- a/gm/imagemasksubset.cpp
+++ b/gm/imagemasksubset.cpp
@@ -64,7 +64,7 @@
surface = SkSurface::MakeRenderTarget(c->recordingContext(),
skgpu::Budgeted::kNo, info);
} else {
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
surface = SkSurface::MakeGraphite(c->recorder(), info);
#endif
}
@@ -96,7 +96,7 @@
if (auto direct = GrAsDirectContext(canvas->recordingContext())) {
subset = image->makeSubset(kSubset, direct);
} else {
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
subset = image->makeSubset(kSubset, canvas->recorder());
#endif
}
diff --git a/gm/makecolorspace.cpp b/gm/makecolorspace.cpp
index 25ba8d0..0f30112 100644
--- a/gm/makecolorspace.cpp
+++ b/gm/makecolorspace.cpp
@@ -39,7 +39,7 @@
}
sk_sp<SkImage> xform;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (auto recorder = canvas->recorder()) {
xform = orig->makeColorSpace(colorSpace, recorder);
} else
@@ -123,7 +123,7 @@
// because of the codec issues mentioned above.
sk_sp<SkImage> image565;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (auto recorder = canvas->recorder()) {
image565 = image->makeColorTypeAndColorSpace(kRGB_565_SkColorType,
rec2020, recorder);
@@ -142,7 +142,7 @@
// Grayscale in the original color space. This fails in even more cases, due to the
// above opaque issue, and because Ganesh doesn't support drawing to gray, at all.
sk_sp<SkImage> imageGray;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (auto recorder = canvas->recorder()) {
imageGray = image->makeColorTypeAndColorSpace(kGray_8_SkColorType,
image->refColorSpace(),
@@ -160,7 +160,7 @@
}
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (auto recorder = canvas->recorder()) {
images[j] = image->makeTextureImage(recorder);
} else
@@ -215,7 +215,7 @@
auto direct = GrAsDirectContext(canvas->recordingContext());
sk_sp<SkImage> gpuImage;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (auto recorder = canvas->recorder()) {
gpuImage = image->makeTextureImage(recorder);
} else
@@ -230,7 +230,7 @@
canvas->drawImage(image, 0.0f, 0.0f);
canvas->drawImage(image->reinterpretColorSpace(spin), 128.0f, 0.0f);
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (auto recorder = canvas->recorder()) {
gpuImage = image->makeColorSpace(spin, recorder);
} else
diff --git a/gm/slug.cpp b/gm/slug.cpp
index 5a94188..c88c0be 100644
--- a/gm/slug.cpp
+++ b/gm/slug.cpp
@@ -25,7 +25,7 @@
#include "include/private/chromium/Slug.h"
#include "tools/ToolUtils.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrContextOptions.h"
class SlugGM : public skiagm::GM {
diff --git a/include/android/SkAndroidFrameworkUtils.h b/include/android/SkAndroidFrameworkUtils.h
index 08a8590..3407cfd 100644
--- a/include/android/SkAndroidFrameworkUtils.h
+++ b/include/android/SkAndroidFrameworkUtils.h
@@ -27,7 +27,7 @@
class SkAndroidFrameworkUtils {
public:
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/**
* clipWithStencil draws the current clip into a stencil buffer with reference value and mask
* set to 0x1. This function works only on a GPU canvas.
@@ -37,7 +37,7 @@
* @return true on success or false if clip is empty or not a GPU canvas.
*/
static bool clipWithStencil(SkCanvas* canvas);
-#endif //defined(SK_GANESH_ENABLED)
+#endif //defined(SK_GANESH)
static void SafetyNetLog(const char*);
diff --git a/include/config/SkUserConfig.h b/include/config/SkUserConfig.h
index 543ea72..74c21f9 100644
--- a/include/config/SkUserConfig.h
+++ b/include/config/SkUserConfig.h
@@ -77,12 +77,12 @@
/* Determines whether to build code that supports the Ganesh GPU backend. Some classes
that are not GPU-specific, such as SkShader subclasses, have optional code
that is used allows them to interact with this GPU backend. If you'd like to
- include this code, include -DSK_GANESH_ENABLED in your cflags or uncomment below.
+ include this code, include -DSK_GANESH in your cflags or uncomment below.
Defaults to not set (No Ganesh GPU backend).
This define affects the ABI of Skia, so make sure it matches the client which uses
the compiled version of Skia.
*/
-//#define SK_GANESH_ENABLED
+//#define SK_GANESH
/* Skia makes use of histogram logging macros to trace the frequency of
events. By default, Skia provides no-op versions of these macros.
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 6237adb..650d917 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -74,7 +74,7 @@
namespace sktext::gpu { class Slug; }
namespace SkRecords { class Draw; }
-#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && defined(SK_GANESH_ENABLED)
+#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && defined(SK_GANESH)
class GrBackendRenderTarget;
#endif
@@ -2183,7 +2183,7 @@
///////////////////////////////////////////////////////////////////////////
-#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && defined(SK_GANESH_ENABLED)
+#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && defined(SK_GANESH)
// These methods exist to support WebView in Android Framework.
SkIRect topLayerBounds() const;
GrBackendRenderTarget topLayerBackendRenderTarget() const;
@@ -2300,7 +2300,7 @@
virtual void onDiscard();
-#if (defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED))
+#if (defined(SK_GANESH) || defined(SK_GRAPHITE))
/** Experimental
*/
virtual sk_sp<sktext::gpu::Slug> onConvertGlyphRunListToSlug(
@@ -2457,7 +2457,7 @@
SkCanvas& operator=(SkCanvas&&) = delete;
SkCanvas& operator=(const SkCanvas&) = delete;
-#if (defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED))
+#if (defined(SK_GANESH) || defined(SK_GRAPHITE))
friend class sktext::gpu::Slug;
/** Experimental
* Convert a SkTextBlob to a sktext::gpu::Slug using the current canvas state.
diff --git a/include/core/SkCapabilities.h b/include/core/SkCapabilities.h
index ef15c16..214b513 100644
--- a/include/core/SkCapabilities.h
+++ b/include/core/SkCapabilities.h
@@ -15,7 +15,7 @@
namespace SkSL { struct ShaderCaps; }
#endif
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
namespace skgpu::graphite { class Caps; }
#endif
@@ -28,7 +28,7 @@
#endif
protected:
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
friend class skgpu::graphite::Caps; // for ctor
#endif
diff --git a/include/core/SkDeferredDisplayList.h b/include/core/SkDeferredDisplayList.h
index 3be88fd..0729636 100644
--- a/include/core/SkDeferredDisplayList.h
+++ b/include/core/SkDeferredDisplayList.h
@@ -14,7 +14,7 @@
class SkDeferredDisplayListPriv;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrRecordingContext.h"
#include "include/private/base/SkTArray.h"
#include <map>
@@ -36,7 +36,7 @@
return fCharacterization;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/**
* Iterate through the programs required by the DDL.
*/
@@ -70,7 +70,7 @@
// texture when the DDL is replayed. It has to be separately ref counted bc the lazy proxy
// can outlive the DDL.
class LazyProxyData : public SkRefCnt {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
public:
// Upon being replayed - this field will be filled in (by the DrawingManager) with the
// proxy backing the destination SkSurface. Note that, since there is no good place to
@@ -87,7 +87,7 @@
sk_sp<GrRenderTargetProxy> fTargetProxy,
sk_sp<LazyProxyData>);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
const SkTArray<GrRecordingContext::ProgramData>& programData() const {
return fProgramData;
}
@@ -95,7 +95,7 @@
const SkSurfaceCharacterization fCharacterization;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// These are ordered such that the destructor cleans op tasks up first (which may refer back
// to the arena and memory pool in their destructors).
GrRecordingContext::OwnedArenas fArenas;
diff --git a/include/core/SkDeferredDisplayListRecorder.h b/include/core/SkDeferredDisplayListRecorder.h
index 3717659..67ee03f 100644
--- a/include/core/SkDeferredDisplayListRecorder.h
+++ b/include/core/SkDeferredDisplayListRecorder.h
@@ -50,7 +50,7 @@
sk_sp<SkDeferredDisplayList> detach();
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
using PromiseImageTextureContext = SkImage::PromiseImageTextureContext;
using PromiseImageTextureFulfillProc = SkImage::PromiseImageTextureFulfillProc;
using PromiseImageTextureReleaseProc = SkImage::PromiseImageTextureReleaseProc;
@@ -76,7 +76,7 @@
PromiseImageTextureReleaseProc textureReleaseProc,
PromiseImageTextureContext textureContexts[]);
#endif // SK_MAKE_PROMISE_TEXTURE_DISABLE_LEGACY_API
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
private:
SkDeferredDisplayListRecorder(const SkDeferredDisplayListRecorder&) = delete;
@@ -86,7 +86,7 @@
const SkSurfaceCharacterization fCharacterization;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
sk_sp<GrRecordingContext> fContext;
sk_sp<GrRenderTargetProxy> fTargetProxy;
sk_sp<SkDeferredDisplayList::LazyProxyData> fLazyProxyData;
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index c4a1549..6238e9f 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -15,11 +15,11 @@
#include "include/core/SkSize.h"
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GpuTypes.h"
#include "include/gpu/GrTypes.h"
#endif
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/GraphiteTypes.h"
#endif
@@ -61,7 +61,7 @@
struct SkIPoint;
struct SkSamplingOptions;
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
namespace skgpu::graphite {
class BackendTexture;
class Recorder;
@@ -279,7 +279,7 @@
const SkMatrix* matrix, const SkPaint* paint,
BitDepth bitDepth, sk_sp<SkColorSpace> colorSpace);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/** Creates a GPU-backed SkImage from compressed data.
This method will return an SkImage representing the compressed data.
@@ -566,7 +566,7 @@
PromiseImageTextureReleaseProc textureReleaseProc,
PromiseImageTextureContext textureContexts[]);
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
#if defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26
/** (See Skia bug 7447)
@@ -783,7 +783,7 @@
*/
bool isValid(GrRecordingContext* context) const;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/** Flushes any pending uses of texture-backed images in the GPU backend. If the image is not
texture-backed (including promise texture images) or if the GrDirectContext does not
have the same context ID as the context backing the image then this is a no-op.
@@ -817,7 +817,7 @@
*/
GrBackendTexture getBackendTexture(bool flushPendingGrContextIO,
GrSurfaceOrigin* origin = nullptr) const;
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
/** \enum SkImage::CachingHint
CachingHint selects whether Skia may internally cache SkBitmap generated by
@@ -1131,7 +1131,7 @@
*/
sk_sp<SkImage> withDefaultMipmaps() const;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/** Returns SkImage backed by GPU texture associated with context. Returned SkImage is
compatible with SkSurface created with dstColorSpace. The returned SkImage respects
mipmapped setting; if mipmapped equals GrMipmapped::kYes, the backing texture
@@ -1156,9 +1156,9 @@
sk_sp<SkImage> makeTextureImage(GrDirectContext*,
GrMipmapped = GrMipmapped::kNo,
skgpu::Budgeted = skgpu::Budgeted::kYes) const;
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
// Passed to both fulfill and imageRelease
using GraphitePromiseImageContext = void*;
@@ -1337,7 +1337,7 @@
skgpu::graphite::Recorder*,
RequiredImageProperties = {}) const;
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
/** Returns raster image or lazy image. Copies SkImage backed by GPU texture into
CPU memory if needed. Returns original SkImage if decoded in raster bitmap,
@@ -1400,7 +1400,7 @@
*/
typedef std::function<void(GrBackendTexture)> BackendTextureReleaseProc;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/** Creates a GrBackendTexture from the provided SkImage. Returns true and
stores result in backendTexture and backendTextureReleaseProc if
texture is created; otherwise, returns false and leaves
diff --git a/include/core/SkImageGenerator.h b/include/core/SkImageGenerator.h
index 5ae5775..80450b5 100644
--- a/include/core/SkImageGenerator.h
+++ b/include/core/SkImageGenerator.h
@@ -115,7 +115,7 @@
*/
bool getYUVAPlanes(const SkYUVAPixmaps& yuvaPixmaps);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/**
* If the generator can natively/efficiently return its pixels as a GPU image (backed by a
* texture) this will return that image. If not, this will return NULL.
@@ -141,7 +141,7 @@
GrImageTexGenPolicy);
#endif
-#if SK_GRAPHITE_ENABLED
+#if SK_GRAPHITE
sk_sp<SkImage> makeTextureImage(skgpu::graphite::Recorder*,
const SkImageInfo&,
skgpu::Mipmapped);
@@ -181,7 +181,7 @@
virtual bool onQueryYUVAInfo(const SkYUVAPixmapInfo::SupportedDataTypes&,
SkYUVAPixmapInfo*) const { return false; }
virtual bool onGetYUVAPlanes(const SkYUVAPixmaps&) { return false; }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// returns nullptr
virtual GrSurfaceProxyView onGenerateTexture(GrRecordingContext*, const SkImageInfo&,
GrMipmapped, GrImageTexGenPolicy);
@@ -193,7 +193,7 @@
virtual GrSurfaceOrigin origin() const { return kTopLeft_GrSurfaceOrigin; }
#endif
-#if SK_GRAPHITE_ENABLED
+#if SK_GRAPHITE
virtual sk_sp<SkImage> onMakeTextureImage(skgpu::graphite::Recorder*,
const SkImageInfo&,
skgpu::Mipmapped);
diff --git a/include/core/SkPromiseImageTexture.h b/include/core/SkPromiseImageTexture.h
index aa4468f..0bd4034 100644
--- a/include/core/SkPromiseImageTexture.h
+++ b/include/core/SkPromiseImageTexture.h
@@ -10,7 +10,7 @@
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/core/SkRefCnt.h"
#include "include/gpu/GrBackendSurface.h"
/**
@@ -41,6 +41,6 @@
GrBackendTexture fBackendTexture;
};
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
#endif // SkPromiseImageTexture_DEFINED
diff --git a/include/core/SkSurface.h b/include/core/SkSurface.h
index d17461e..6ddc8bf 100644
--- a/include/core/SkSurface.h
+++ b/include/core/SkSurface.h
@@ -17,13 +17,18 @@
#include "include/core/SkSurfaceProps.h"
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrTypes.h"
#else
enum GrSurfaceOrigin: int;
#endif
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
+#include "include/gpu/GpuTypes.h"
+#include "include/gpu/GrTypes.h"
+#endif
+
+#if defined(SK_GRAPHITE)
#include "include/gpu/GpuTypes.h"
namespace skgpu::graphite {
class BackendTexture;
@@ -35,7 +40,7 @@
class GrDirectContext;
#endif
-#if defined(SK_GANESH_ENABLED) && defined(SK_METAL)
+#if defined(SK_GANESH) && defined(SK_METAL)
#include "include/gpu/mtl/GrMtlTypes.h"
#endif
@@ -226,7 +231,7 @@
backend API (accounting only for use of the texture by this surface). If SkSurface creation
fails textureReleaseProc is called before this function returns.
- If defined(SK_GANESH_ENABLED) is defined as zero, has no effect and returns nullptr.
+ If defined(SK_GANESH) is defined as zero, has no effect and returns nullptr.
@param context GPU context
@param backendTexture texture residing on GPU
@@ -261,7 +266,7 @@
backend API (accounting only for use of the render target by this surface). If SkSurface
creation fails releaseProc is called before this function returns.
- If defined(SK_GANESH_ENABLED) is defined as zero, has no effect and returns nullptr.
+ If defined(SK_GANESH) is defined as zero, has no effect and returns nullptr.
@param context GPU context
@param backendRenderTarget GPU intermediate memory buffer
@@ -296,7 +301,7 @@
shouldCreateWithMips hints that SkImage returned by makeImageSnapshot() is mip map.
- If defined(SK_GANESH_ENABLED) is defined as zero, has no effect and returns nullptr.
+ If defined(SK_GANESH) is defined as zero, has no effect and returns nullptr.
@param context GPU context
@param imageInfo width, height, SkColorType, SkAlphaType, SkColorSpace;
@@ -341,7 +346,7 @@
const SkImageInfo& imageInfo,
int sampleCount,
const SkSurfaceProps* surfaceProps) {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
return MakeRenderTarget(context, budgeted, imageInfo, sampleCount,
kBottomLeft_GrSurfaceOrigin, surfaceProps);
#else
@@ -366,7 +371,7 @@
static sk_sp<SkSurface> MakeRenderTarget(GrRecordingContext* context,
skgpu::Budgeted budgeted,
const SkImageInfo& imageInfo) {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (!imageInfo.width() || !imageInfo.height()) {
return nullptr;
}
@@ -422,7 +427,7 @@
);
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
/**
* In Graphite, while clients hold a ref on an SkSurface, the backing gpu object does _not_
* count against the budget. Once an SkSurface is freed, the backing gpu object may or may
@@ -454,9 +459,9 @@
sk_sp<SkColorSpace> colorSpace,
const SkSurfaceProps* props);
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
-#if defined(SK_GANESH_ENABLED) && defined(SK_METAL)
+#if defined(SK_GANESH) && defined(SK_METAL)
/** Creates SkSurface from CAMetalLayer.
Returned SkSurface takes a reference on the CAMetalLayer. The ref on the layer will be
released when the SkSurface is destroyed.
@@ -590,7 +595,7 @@
*/
skgpu::graphite::Recorder* recorder();
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
enum BackendHandleAccess {
kFlushRead_BackendHandleAccess, //!< back-end object is readable
kFlushWrite_BackendHandleAccess, //!< back-end object is writable
@@ -714,7 +719,7 @@
*/
sk_sp<SkImage> makeImageSnapshot(const SkIRect& bounds);
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
/**
* The 'asImage' and 'makeImageCopy' API/entry points are currently only available for
* Graphite.
@@ -1016,7 +1021,7 @@
kPresent, //!< back-end surface will be used for presenting to screen
};
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/** If a surface is GPU texture backed, is being drawn with MSAA, and there is a resolve
texture, this call will insert a resolve command into the stream of gpu commands. In order
for the resolve to actually have an effect, the work still needs to be flushed and submitted
@@ -1122,7 +1127,7 @@
*/
GrSemaphoresSubmitted flush(const GrFlushInfo& info,
const skgpu::MutableTextureState* newState = nullptr);
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
void flush();
diff --git a/include/core/SkSurfaceCharacterization.h b/include/core/SkSurfaceCharacterization.h
index ef74f96..075f601 100644
--- a/include/core/SkSurfaceCharacterization.h
+++ b/include/core/SkSurfaceCharacterization.h
@@ -17,7 +17,7 @@
class SkColorSpace;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrContextThreadSafeProxy.h"
#include "include/gpu/GrTypes.h"
@@ -210,7 +210,7 @@
SkSurfaceProps fSurfaceProps;
};
-#else// !defined(SK_GANESH_ENABLED)
+#else// !defined(SK_GANESH)
class GrBackendFormat;
class SK_API SkSurfaceCharacterization {
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 9a4fbc7..22a5545 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -28,12 +28,12 @@
// Legacy flag
#if defined(SK_SUPPORT_GPU)
-#if SK_SUPPORT_GPU && !defined(SK_GANESH_ENABLED)
-# define SK_GANESH_ENABLED
+#if SK_SUPPORT_GPU && !defined(SK_GANESH)
+# define SK_GANESH
#endif
#endif
-#if defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GANESH) || defined(SK_GRAPHITE)
# if !defined(SK_ENABLE_SKSL)
# define SK_ENABLE_SKSL
# endif
diff --git a/include/effects/SkRuntimeEffect.h b/include/effects/SkRuntimeEffect.h
index 78e6d02..81246d4 100644
--- a/include/effects/SkRuntimeEffect.h
+++ b/include/effects/SkRuntimeEffect.h
@@ -311,7 +311,7 @@
const SkFilterColorProgram* getFilterColorProgram() const;
const SkSL::RP::Program* getRPProgram() const;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
friend class GrSkSLFP; // fBaseProgram, fSampleUsages
friend class GrGLSLSkSLFP; //
#endif
diff --git a/include/gpu/GrBackendSurface.h b/include/gpu/GrBackendSurface.h
index 4439c79..7144666 100644
--- a/include/gpu/GrBackendSurface.h
+++ b/include/gpu/GrBackendSurface.h
@@ -57,7 +57,7 @@
class SkString;
#endif
-#if !defined(SK_GANESH_ENABLED)
+#if !defined(SK_GANESH)
// SkSurfaceCharacterization always needs a minimal version of this
class SK_API GrBackendFormat {
diff --git a/include/gpu/GrContextOptions.h b/include/gpu/GrContextOptions.h
index 6801bfe..d5d094d 100644
--- a/include/gpu/GrContextOptions.h
+++ b/include/gpu/GrContextOptions.h
@@ -20,7 +20,7 @@
class SkExecutor;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
struct SK_API GrContextOptions {
enum class Enable {
/** Forces an option to be disabled. */
diff --git a/include/gpu/GrContextThreadSafeProxy.h b/include/gpu/GrContextThreadSafeProxy.h
index a3359c7..00d27a1 100644
--- a/include/gpu/GrContextThreadSafeProxy.h
+++ b/include/gpu/GrContextThreadSafeProxy.h
@@ -10,7 +10,7 @@
#include "include/core/SkRefCnt.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/core/SkImageInfo.h"
#include "include/gpu/GrContextOptions.h"
@@ -160,7 +160,7 @@
std::atomic<bool> fAbandoned{false};
};
-#else // !defined(SK_GANESH_ENABLED)
+#else // !defined(SK_GANESH)
class SK_API GrContextThreadSafeProxy final : public SkNVRefCnt<GrContextThreadSafeProxy> {};
#endif
diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h
index d548402..87c6916 100644
--- a/include/utils/SkNWayCanvas.h
+++ b/include/utils/SkNWayCanvas.h
@@ -45,7 +45,7 @@
struct SkRSXform;
struct SkRect;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
namespace sktext::gpu {
class Slug;
}
@@ -77,7 +77,7 @@
void onDrawGlyphRunList(const sktext::GlyphRunList&, const SkPaint&) override;
void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
const SkPaint& paint) override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void onDrawSlug(const sktext::gpu::Slug* slug) override;
#endif
void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
diff --git a/modules/canvaskit/BUILD.gn b/modules/canvaskit/BUILD.gn
index b71ee5c..941329e 100644
--- a/modules/canvaskit/BUILD.gn
+++ b/modules/canvaskit/BUILD.gn
@@ -57,6 +57,7 @@
"../..:tool_utils",
"../../modules/svg:svg",
]
+ defines = [ "SK_GANESH" ]
}
}
@@ -70,6 +71,7 @@
"../../tools/debugger/DrawCommand.cpp",
"../../tools/debugger/JsonWriteBuffer.cpp",
]
+ defines = [ "SK_GANESH" ]
}
action("create_notomono_cpp") {
@@ -359,7 +361,7 @@
}
if (skia_enable_gpu) {
defines += [
- "SK_GANESH_ENABLED",
+ "SK_GANESH",
"SK_DISABLE_LEGACY_SHADERCONTEXT",
]
if (skia_canvaskit_enable_webgl) {
diff --git a/modules/canvaskit/compile_gm.sh b/modules/canvaskit/compile_gm.sh
index f397ed1..b1d8384 100755
--- a/modules/canvaskit/compile_gm.sh
+++ b/modules/canvaskit/compile_gm.sh
@@ -48,7 +48,7 @@
GN_GPU="skia_enable_gpu=true skia_gl_standard = \"webgl\""
GN_GPU_FLAGS="\"-DSK_DISABLE_LEGACY_SHADERCONTEXT\","
-WASM_GPU="-lGL -DSK_GANESH_ENABLED -DSK_GL -DCK_ENABLE_WEBGL \
+WASM_GPU="-lGL -DSK_GANESH -DSK_GL -DCK_ENABLE_WEBGL \
-DSK_DISABLE_LEGACY_SHADERCONTEXT --pre-js $BASE_DIR/cpu.js --pre-js $BASE_DIR/webgl.js\
-sUSE_WEBGL2=1"
diff --git a/public.bzl b/public.bzl
index bf8dd83..df64f43 100644
--- a/public.bzl
+++ b/public.bzl
@@ -2054,6 +2054,8 @@
################################################################################
BASE_DEFINES = [
+ # Our legacy G3 rule *always* has the ganesh backend enabled.
+ "SK_GANESH",
# Chrome DEFINES.
"SK_USE_FREETYPE_EMBOLDEN",
# Turn on a few Google3-specific build fixes.
@@ -2102,7 +2104,7 @@
"SK_DISABLE_LEGACY_SHADERCONTEXT",
"SK_DISABLE_TRACING",
"SK_GL",
- "SK_GANESH_ENABLED",
+ "SK_GANESH",
"SK_DISABLE_AAA",
"SK_DISABLE_EFFECT_DESERIALIZATION",
"SK_FORCE_8_BYTE_ALIGNMENT",
diff --git a/src/android/SkAndroidFrameworkUtils.cpp b/src/android/SkAndroidFrameworkUtils.cpp
index 6d41e45..39b941a 100644
--- a/src/android/SkAndroidFrameworkUtils.cpp
+++ b/src/android/SkAndroidFrameworkUtils.cpp
@@ -16,7 +16,7 @@
#include <log/log.h>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
bool SkAndroidFrameworkUtils::clipWithStencil(SkCanvas* canvas) {
return canvas->baseDevice()->android_utils_clipWithStencil();
}
diff --git a/src/core/SkBlendModeBlender.cpp b/src/core/SkBlendModeBlender.cpp
index 50644d5..5087c60 100644
--- a/src/core/SkBlendModeBlender.cpp
+++ b/src/core/SkBlendModeBlender.cpp
@@ -9,12 +9,12 @@
#include "src/core/SkReadBuffer.h"
#include "src/core/SkWriteBuffer.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h"
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
#endif
@@ -64,7 +64,7 @@
#undef RETURN_SINGLETON_BLENDER
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkBlenderBase::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer,
@@ -92,7 +92,7 @@
buffer.writeInt((int)fMode);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> SkBlendModeBlender::asFragmentProcessor(
std::unique_ptr<GrFragmentProcessor> srcFP,
std::unique_ptr<GrFragmentProcessor> dstFP,
diff --git a/src/core/SkBlendModeBlender.h b/src/core/SkBlendModeBlender.h
index 603f839..03941cf 100644
--- a/src/core/SkBlendModeBlender.h
+++ b/src/core/SkBlendModeBlender.h
@@ -16,7 +16,7 @@
std::optional<SkBlendMode> asBlendMode() const final { return fMode; }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
std::unique_ptr<GrFragmentProcessor> srcFP,
std::unique_ptr<GrFragmentProcessor> dstFP,
diff --git a/src/core/SkBlendModePriv.h b/src/core/SkBlendModePriv.h
index aa933a5..1b1a592 100644
--- a/src/core/SkBlendModePriv.h
+++ b/src/core/SkBlendModePriv.h
@@ -32,7 +32,7 @@
SkPMColor4f SkBlendMode_Apply(SkBlendMode, const SkPMColor4f& src, const SkPMColor4f& dst);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrXferProcessor.h"
const GrXPFactory* SkBlendMode_AsXPFactory(SkBlendMode);
#endif
diff --git a/src/core/SkBlenderBase.h b/src/core/SkBlenderBase.h
index f1d635b..1f3e385 100644
--- a/src/core/SkBlenderBase.h
+++ b/src/core/SkBlenderBase.h
@@ -46,7 +46,7 @@
return this->onProgram(p, src, dst, colorInfo, uniforms, alloc);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/**
* Returns a GrFragmentProcessor that implements this blend for the GPU backend.
* The GrFragmentProcessor expects premultiplied inputs and returns a premultiplied output.
@@ -59,7 +59,7 @@
virtual SkRuntimeEffect* asRuntimeEffect() const { return nullptr; }
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
/**
* TODO: Make pure virtual.
* primitiveColorBlender = true when blending the result of the paint evaluation with a
diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp
index 863b372d..cd3cd5f 100644
--- a/src/core/SkBlurMF.cpp
+++ b/src/core/SkBlurMF.cpp
@@ -21,7 +21,7 @@
#include "src/core/SkStringUtils.h"
#include "src/core/SkWriteBuffer.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrRecordingContext.h"
#include "src/core/SkRuntimeEffectPriv.h"
#include "src/gpu/SkBackingFit.h"
@@ -43,7 +43,7 @@
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h"
#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h"
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
using namespace skia_private;
@@ -56,7 +56,7 @@
bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&,
SkIPoint* margin) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
bool canFilterMaskGPU(const GrStyledShape& shape,
const SkIRect& devSpaceShapeBounds,
const SkIRect& clipBounds,
@@ -579,7 +579,7 @@
}
-#if defined(SK_GANESH_ENABLED) && defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH) && defined(SK_GANESH)
///////////////////////////////////////////////////////////////////////////////
// Circle Blur
@@ -1077,7 +1077,7 @@
const SkRRect& rrectToDraw,
const SkISize& dimensions,
float xformedSigma) {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
SkASSERT(!SkGpuBlurUtils::IsEffectivelyZeroSigma(xformedSigma));
// We cache blur masks. Use default surface props here so we can use the same cached mask
@@ -1667,7 +1667,7 @@
return surfaceDrawContext->readSurfaceView();
}
-#endif // defined(SK_GANESH_ENABLED) && defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH) && defined(SK_GANESH)
void sk_register_blur_maskfilter_createproc() { SK_REGISTER_FLATTENABLE(SkBlurMaskFilterImpl); }
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 3d5873d..1d2cd0d 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -70,7 +70,7 @@
#include <utility>
#include <vector>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/ganesh/Device_v1.h"
@@ -81,11 +81,11 @@
#endif
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/Device.h"
#endif
-#if (defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED))
+#if (defined(SK_GANESH) || defined(SK_GRAPHITE))
#include "include/private/chromium/SkChromeRemoteGlyphCache.h"
#include "include/private/chromium/Slug.h"
#endif
@@ -543,7 +543,7 @@
}
void SkCanvas::onFlush() {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
auto dContext = GrAsDirectContext(this->recordingContext());
if (dContext) {
@@ -1794,7 +1794,7 @@
return fMCRec->fMatrix;
}
-#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && defined(SK_GANESH_ENABLED)
+#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && defined(SK_GANESH)
SkIRect SkCanvas::topLayerBounds() const {
return this->topDevice()->getGlobalBounds();
@@ -1811,7 +1811,7 @@
#endif
GrRecordingContext* SkCanvas::recordingContext() {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (auto gpuDevice = this->topDevice()->asGaneshDevice()) {
return gpuDevice->recordingContext();
}
@@ -1821,7 +1821,7 @@
}
skgpu::graphite::Recorder* SkCanvas::recorder() {
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (auto graphiteDevice = this->topDevice()->asGraphiteDevice()) {
return graphiteDevice->recorder();
}
@@ -2449,7 +2449,7 @@
}
}
-#if (defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED))
+#if (defined(SK_GANESH) || defined(SK_GRAPHITE))
sk_sp<Slug> SkCanvas::convertBlobToSlug(
const SkTextBlob& blob, SkPoint origin, const SkPaint& paint) {
TRACE_EVENT0("skia", TRACE_FUNC);
@@ -2563,7 +2563,7 @@
this->onDrawGlyphRunList(glyphRunList, paint);
}
-#if defined(SK_GANESH_ENABLED) && GR_TEST_UTILS
+#if defined(SK_GANESH) && GR_TEST_UTILS
bool gSkBlobAsSlugTesting = false;
#endif
@@ -2586,7 +2586,7 @@
totalGlyphCount += r.fGlyphCount;
}
-#if defined(SK_GANESH_ENABLED) && GR_TEST_UTILS
+#if defined(SK_GANESH) && GR_TEST_UTILS
// Draw using text blob normally or if the blob has RSX form because slugs can't convert that
// form.
if (!gSkBlobAsSlugTesting ||
@@ -2596,7 +2596,7 @@
{
this->onDrawTextBlob(blob, x, y, paint);
}
-#if defined(SK_GANESH_ENABLED) && GR_TEST_UTILS
+#if defined(SK_GANESH) && GR_TEST_UTILS
else {
auto slug = Slug::ConvertBlob(this, *blob, {x, y}, paint);
slug->draw(this);
@@ -2996,7 +2996,7 @@
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED) && GR_TEST_UTILS
+#if defined(SK_GANESH) && GR_TEST_UTILS
SkTestCanvas<SkSlugTestKey>::SkTestCanvas(SkCanvas* canvas)
: SkCanvas(sk_ref_sp(canvas->baseDevice())) {}
diff --git a/src/core/SkCanvasPriv.cpp b/src/core/SkCanvasPriv.cpp
index 9ced7dd..c145af3 100644
--- a/src/core/SkCanvasPriv.cpp
+++ b/src/core/SkCanvasPriv.cpp
@@ -101,7 +101,7 @@
*totalMatrixCount = maxMatrixIndex + 1;
}
-#if GR_TEST_UTILS && defined(SK_GANESH_ENABLED)
+#if GR_TEST_UTILS && defined(SK_GANESH)
#include "src/gpu/ganesh/Device_v1.h"
@@ -121,10 +121,10 @@
return nullptr;
}
-#endif // GR_TEST_UTILS && defined(SK_GANESH_ENABLED)
+#endif // GR_TEST_UTILS && defined(SK_GANESH)
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/Device_v1.h"
GrRenderTargetProxy* SkCanvasPriv::TopDeviceTargetProxy(SkCanvas* canvas) {
@@ -135,13 +135,13 @@
return nullptr;
}
-#else // defined(SK_GANESH_ENABLED)
+#else // defined(SK_GANESH)
GrRenderTargetProxy* SkCanvasPriv::TopDeviceTargetProxy(SkCanvas* canvas) {
return nullptr;
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
#if GRAPHITE_TEST_UTILS
#include "src/gpu/graphite/Device.h"
diff --git a/src/core/SkCanvasPriv.h b/src/core/SkCanvasPriv.h
index 5e81179..579235b 100644
--- a/src/core/SkCanvasPriv.h
+++ b/src/core/SkCanvasPriv.h
@@ -14,7 +14,7 @@
class SkReadBuffer;
class SkWriteBuffer;
-#if GR_TEST_UTILS && defined(SK_GANESH_ENABLED)
+#if GR_TEST_UTILS && defined(SK_GANESH)
namespace skgpu::v1 {
class SurfaceDrawContext;
class SurfaceFillContext;
@@ -22,11 +22,11 @@
#endif
// This declaration must match the one in SkDeferredDisplayList.h
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
class GrRenderTargetProxy;
#else
using GrRenderTargetProxy = SkRefCnt;
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
#if GRAPHITE_TEST_UTILS
namespace skgpu::graphite {
@@ -71,7 +71,7 @@
return canvas->topDevice();
}
-#if GR_TEST_UTILS && defined(SK_GANESH_ENABLED)
+#if GR_TEST_UTILS && defined(SK_GANESH)
static skgpu::v1::SurfaceDrawContext* TopDeviceSurfaceDrawContext(SkCanvas*);
static skgpu::v1::SurfaceFillContext* TopDeviceSurfaceFillContext(SkCanvas*);
#endif
diff --git a/src/core/SkChromeRemoteGlyphCache.cpp b/src/core/SkChromeRemoteGlyphCache.cpp
index e49beda..3510fb7 100644
--- a/src/core/SkChromeRemoteGlyphCache.cpp
+++ b/src/core/SkChromeRemoteGlyphCache.cpp
@@ -35,7 +35,7 @@
#include <tuple>
#include <unordered_map>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrContextOptions.h"
#include "src/gpu/ganesh/GrDrawOpAtlas.h"
#include "src/text/gpu/SDFTControl.h"
@@ -638,7 +638,7 @@
}
// -- GlyphTrackingDevice --------------------------------------------------------------------------
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
class GlyphTrackingDevice final : public SkNoPixelsDevice {
public:
GlyphTrackingDevice(
@@ -731,7 +731,7 @@
SkStrikeServerImpl* const fStrikeServerImpl;
const sktext::gpu::SDFTControl fSDFTControl;
};
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
// -- SkStrikeServer -------------------------------------------------------------------------------
SkStrikeServer::SkStrikeServer(DiscardableHandleManager* dhm)
@@ -744,7 +744,7 @@
sk_sp<SkColorSpace> colorSpace,
bool DFTSupport,
bool DFTPerspSupport) {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrContextOptions ctxOptions;
#if !defined(SK_DISABLE_SDF_TEXT)
auto control = sktext::gpu::SDFTControl{DFTSupport,
@@ -1086,8 +1086,8 @@
return fImpl->translateTypefaceID(descriptor);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
sk_sp<sktext::gpu::Slug> SkStrikeClient::deserializeSlug(const void* data, size_t size) const {
return sktext::gpu::Slug::Deserialize(data, size, this);
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index ae5f996..84bcb45 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -23,13 +23,13 @@
#include "src/core/SkVM.h"
#include "src/core/SkWriteBuffer.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrColorInfo.h"
#include "src/gpu/ganesh/GrColorSpaceXform.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyContext.h"
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
@@ -64,7 +64,7 @@
return false;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrFPResult SkColorFilterBase::asFragmentProcessor(std::unique_ptr<GrFragmentProcessor> inputFP,
GrRecordingContext* context,
const GrColorInfo& dstColorInfo,
@@ -143,7 +143,7 @@
return SkPMColor4f{0,0,0,0};
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkColorFilterBase::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const {
@@ -180,7 +180,7 @@
return c ? fOuter->program(p, c, dst, uniforms, alloc) : skvm::Color{};
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrFPResult asFragmentProcessor(std::unique_ptr<GrFragmentProcessor> inputFP,
GrRecordingContext* context,
const GrColorInfo& dstColorInfo,
@@ -205,7 +205,7 @@
}
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const override {
@@ -218,7 +218,7 @@
builder->endBlock();
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
protected:
void flatten(SkWriteBuffer& buffer) const override {
@@ -273,7 +273,7 @@
{}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrFPResult asFragmentProcessor(std::unique_ptr<GrFragmentProcessor> inputFP,
GrRecordingContext* context,
const GrColorInfo& dstColorInfo,
@@ -286,7 +286,7 @@
}
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const override {
@@ -404,7 +404,7 @@
return SkColorSpace::MakeRGB(tf, gamut);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrFPResult asFragmentProcessor(std::unique_ptr<GrFragmentProcessor> inputFP,
GrRecordingContext* context,
const GrColorInfo& dstColorInfo,
@@ -427,7 +427,7 @@
}
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const override {
diff --git a/src/core/SkColorFilterBase.h b/src/core/SkColorFilterBase.h
index e49b3df..8cdb459 100644
--- a/src/core/SkColorFilterBase.h
+++ b/src/core/SkColorFilterBase.h
@@ -45,7 +45,7 @@
*/
virtual bool onIsAlphaUnchanged() const { return false; }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/**
* A subclass may implement this factory function to work with the GPU backend. It returns
* a GrFragmentProcessor that implements the color filter in GPU shader code.
@@ -84,7 +84,7 @@
virtual SkPMColor4f onFilterColor4f(const SkPMColor4f& color, SkColorSpace* dstCS) const;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
/**
Add implementation details, for the specified backend, of this SkColorFilter to the
provided key.
diff --git a/src/core/SkColorFilter_Matrix.cpp b/src/core/SkColorFilter_Matrix.cpp
index 8e6e99c..7ecdbcc 100644
--- a/src/core/SkColorFilter_Matrix.cpp
+++ b/src/core/SkColorFilter_Matrix.cpp
@@ -18,10 +18,10 @@
#include "src/core/SkVM.h"
#include "src/core/SkWriteBuffer.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
static bool is_alpha_unchanged(const float matrix[20]) {
const float* srcA = matrix + 15;
@@ -43,13 +43,13 @@
bool onIsAlphaUnchanged() const override { return fAlphaIsUnchanged; }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrFPResult asFragmentProcessor(std::unique_ptr<GrFragmentProcessor> inputFP,
GrRecordingContext*,
const GrColorInfo&,
const SkSurfaceProps&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
@@ -159,7 +159,7 @@
return premul(clamp01(c));
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/effects/GrSkSLFP.h"
static std::unique_ptr<GrFragmentProcessor> rgb_to_hsl(std::unique_ptr<GrFragmentProcessor> child) {
@@ -209,9 +209,9 @@
return GrFPSuccess(std::move(fp));
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkColorFilter_Matrix::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const {
@@ -223,7 +223,7 @@
MatrixColorFilterBlock::BeginBlock(keyContext, builder, gatherer, &matrixCFData);
builder->endBlock();
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkDeferredDisplayList.cpp b/src/core/SkDeferredDisplayList.cpp
index 65e2091..9c9e98c 100644
--- a/src/core/SkDeferredDisplayList.cpp
+++ b/src/core/SkDeferredDisplayList.cpp
@@ -15,7 +15,7 @@
class SkSurfaceCharacterization;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "src/gpu/ganesh/GrRenderTargetProxy.h"
#include "src/gpu/ganesh/GrRenderTask.h"
@@ -25,19 +25,19 @@
sk_sp<GrRenderTargetProxy> targetProxy,
sk_sp<LazyProxyData> lazyProxyData)
: fCharacterization(characterization)
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
, fArenas(true)
, fTargetProxy(std::move(targetProxy))
, fLazyProxyData(std::move(lazyProxyData))
#endif
{
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
SkASSERT(fTargetProxy->isDDLTarget());
#endif
}
SkDeferredDisplayList::~SkDeferredDisplayList() {
-#if defined(SK_GANESH_ENABLED) && defined(SK_DEBUG)
+#if defined(SK_GANESH) && defined(SK_DEBUG)
for (auto& renderTask : fRenderTasks) {
SkASSERT(renderTask->unique());
}
@@ -45,7 +45,7 @@
}
//-------------------------------------------------------------------------------------------------
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
SkDeferredDisplayList::ProgramIterator::ProgramIterator(GrDirectContext* dContext,
SkDeferredDisplayList* ddl)
diff --git a/src/core/SkDeferredDisplayListPriv.h b/src/core/SkDeferredDisplayListPriv.h
index f0622f9..50c5d4f 100644
--- a/src/core/SkDeferredDisplayListPriv.h
+++ b/src/core/SkDeferredDisplayListPriv.h
@@ -17,7 +17,7 @@
class SkDeferredDisplayListPriv {
public:
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
int numRenderTasks() const {
return fDDL->fRenderTasks.size();
}
diff --git a/src/core/SkDeferredDisplayListRecorder.cpp b/src/core/SkDeferredDisplayListRecorder.cpp
index 347141f..955b0d4 100644
--- a/src/core/SkDeferredDisplayListRecorder.cpp
+++ b/src/core/SkDeferredDisplayListRecorder.cpp
@@ -12,7 +12,7 @@
#include "include/core/SkSurfaceCharacterization.h"
#include "src/core/SkMessageBus.h"
-#if !defined(SK_GANESH_ENABLED)
+#if !defined(SK_GANESH)
SkDeferredDisplayListRecorder::SkDeferredDisplayListRecorder(const SkSurfaceCharacterization&) {}
SkDeferredDisplayListRecorder::~SkDeferredDisplayListRecorder() {}
diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
index 250797f..b18e853 100644
--- a/src/core/SkDevice.cpp
+++ b/src/core/SkDevice.cpp
@@ -33,7 +33,7 @@
#include "src/shaders/SkLocalMatrixShader.h"
#include "src/text/GlyphRun.h"
#include "src/utils/SkPatchUtils.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/chromium/Slug.h"
#endif
@@ -477,7 +477,7 @@
}
}
-#if (defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED))
+#if (defined(SK_GANESH) || defined(SK_GRAPHITE))
sk_sp<sktext::gpu::Slug> SkBaseDevice::convertGlyphRunListToSlug(
const sktext::GlyphRunList& glyphRunList,
const SkPaint& initialPaint,
diff --git a/src/core/SkDevice.h b/src/core/SkDevice.h
index 6fecbc6..e7d402b 100644
--- a/src/core/SkDevice.h
+++ b/src/core/SkDevice.h
@@ -350,7 +350,7 @@
const SkPaint& drawingPaint) = 0;
// Slug handling routines.
-#if (defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED))
+#if (defined(SK_GANESH) || defined(SK_GRAPHITE))
virtual sk_sp<sktext::gpu::Slug> convertGlyphRunListToSlug(
const sktext::GlyphRunList& glyphRunList,
const SkPaint& initialPaint,
@@ -576,7 +576,7 @@
void drawMesh(const SkMesh&, sk_sp<SkBlender>, const SkPaint&) override {}
#endif
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void drawSlug(SkCanvas*, const sktext::gpu::Slug*, const SkPaint&) override {}
#endif
diff --git a/src/core/SkGpuBlurUtils.cpp b/src/core/SkGpuBlurUtils.cpp
index eb8b088..a69d4f6 100644
--- a/src/core/SkGpuBlurUtils.cpp
+++ b/src/core/SkGpuBlurUtils.cpp
@@ -11,7 +11,7 @@
#include "include/core/SkRect.h"
#include "src/base/SkMathPriv.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/core/SkColorSpace.h"
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/ganesh/GrCaps.h"
@@ -1032,4 +1032,4 @@
} // namespace SkGpuBlurUtils
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
diff --git a/src/core/SkGpuBlurUtils.h b/src/core/SkGpuBlurUtils.h
index ee1f75c..9de24ad 100644
--- a/src/core/SkGpuBlurUtils.h
+++ b/src/core/SkGpuBlurUtils.h
@@ -10,7 +10,7 @@
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/core/SkRefCnt.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/SkBackingFit.h"
@@ -102,6 +102,6 @@
} // namespace SkGpuBlurUtils
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
#endif
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index cc70021..67740fc 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -19,7 +19,7 @@
#include "src/core/SkSpecialSurface.h"
#include "src/core/SkValidationUtils.h"
#include "src/core/SkWriteBuffer.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/SkBackingFit.h"
#include "src/gpu/ganesh/GrColorSpaceXform.h"
@@ -585,7 +585,7 @@
return ctx.withNewDesiredOutput(childOutput);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
sk_sp<SkSpecialImage> SkImageFilter_Base::DrawWithFP(GrRecordingContext* rContext,
std::unique_ptr<GrFragmentProcessor> fp,
const SkIRect& bounds,
diff --git a/src/core/SkImageFilterTypes.h b/src/core/SkImageFilterTypes.h
index 58bf25b..58dc680 100644
--- a/src/core/SkImageFilterTypes.h
+++ b/src/core/SkImageFilterTypes.h
@@ -728,7 +728,7 @@
// The output device's color type, which can be used for intermediate images to be
// compatible with the eventual target of the filtered result.
SkColorType colorType() const { return fColorType; }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrColorType grColorType() const { return SkColorTypeToGrColorType(fColorType); }
#endif
// The output device's color space, so intermediate images can match, and so filtering can
diff --git a/src/core/SkImageFilter_Base.h b/src/core/SkImageFilter_Base.h
index 8d6596b..48dfc94 100644
--- a/src/core/SkImageFilter_Base.h
+++ b/src/core/SkImageFilter_Base.h
@@ -303,7 +303,7 @@
// other filters to need to call it.
Context mapContext(const Context& ctx) const;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
static sk_sp<SkSpecialImage> DrawWithFP(GrRecordingContext* context,
std::unique_ptr<GrFragmentProcessor> fp,
const SkIRect& bounds,
diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp
index 150f2bf..50a9932 100644
--- a/src/core/SkImageGenerator.cpp
+++ b/src/core/SkImageGenerator.cpp
@@ -10,7 +10,7 @@
#include "include/core/SkImage.h"
#include "src/core/SkNextID.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrRecordingContext.h"
#endif
@@ -46,7 +46,7 @@
return this->onGetYUVAPlanes(yuvaPixmaps);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
GrSurfaceProxyView SkImageGenerator::generateTexture(GrRecordingContext* ctx,
@@ -68,9 +68,9 @@
GrImageTexGenPolicy) {
return {};
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#if SK_GRAPHITE_ENABLED
+#if SK_GRAPHITE
#include "src/gpu/graphite/Image_Graphite.h"
sk_sp<SkImage> SkImageGenerator::makeTextureImage(skgpu::graphite::Recorder* recorder,
@@ -90,7 +90,7 @@
return nullptr;
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp
index bc16d8a..02fd0ee 100644
--- a/src/core/SkMaskFilter.cpp
+++ b/src/core/SkMaskFilter.cpp
@@ -29,7 +29,7 @@
#include <cstdint>
#include <memory>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/base/SkTo.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
@@ -41,7 +41,7 @@
struct GrFPArgs;
namespace skgpu { namespace v1 { class SurfaceDrawContext; } }
#endif
-#if defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GANESH) || defined(SK_GRAPHITE)
#include "src/text/gpu/SDFMaskFilter.h"
#endif
@@ -330,7 +330,7 @@
return kUnimplemented_FilterReturn;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor>
SkMaskFilterBase::asFragmentProcessor(const GrFPArgs& args, const SkMatrix& ctm) const {
auto fp = this->onAsFragmentProcessor(args, MatrixRec(ctm));
@@ -397,7 +397,7 @@
void SkMaskFilter::RegisterFlattenables() {
sk_register_blur_maskfilter_createproc();
-#if (defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)) && !defined(SK_DISABLE_SDF_TEXT)
+#if (defined(SK_GANESH) || defined(SK_GRAPHITE)) && !defined(SK_DISABLE_SDF_TEXT)
sktext::gpu::register_sdf_maskfilter_createproc();
#endif
}
diff --git a/src/core/SkMaskFilterBase.h b/src/core/SkMaskFilterBase.h
index 29da416..61aff6c 100644
--- a/src/core/SkMaskFilterBase.h
+++ b/src/core/SkMaskFilterBase.h
@@ -16,7 +16,7 @@
#include "include/private/base/SkNoncopyable.h"
#include "src/core/SkMask.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/shaders/SkShaderBase.h"
#endif
@@ -65,7 +65,7 @@
virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&,
SkIPoint* margin) const = 0;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/**
* Returns a processor if the filter can be expressed a single-pass GrProcessor without
* requiring an explicit input mask. Per-pixel, the effect receives the incoming mask's
@@ -172,7 +172,7 @@
protected:
SkMaskFilterBase() {}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
using MatrixRec = SkShaderBase::MatrixRec;
virtual std::unique_ptr<GrFragmentProcessor> onAsFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const;
diff --git a/src/core/SkMesh.cpp b/src/core/SkMesh.cpp
index 879eb9e..c31dfb7 100644
--- a/src/core/SkMesh.cpp
+++ b/src/core/SkMesh.cpp
@@ -34,10 +34,10 @@
#include "src/sksl/ir/SkSLVariable.h"
#include "src/sksl/ir/SkSLVariableReference.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrGpu.h"
#include "src/gpu/ganesh/GrStagingBufferManager.h"
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
#include <locale>
#include <string>
@@ -655,7 +655,7 @@
if (!dc) {
return SkMeshPriv::CpuIndexBuffer::Make(data, size);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
return SkMeshPriv::GpuIndexBuffer::Make(dc, data, size);
#else
return nullptr;
@@ -678,7 +678,7 @@
if (!dc) {
return SkMeshPriv::CpuVertexBuffer::Make(data, size);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
return SkMeshPriv::GpuVertexBuffer::Make(dc, data, size);
#else
return nullptr;
@@ -868,7 +868,7 @@
return check_update(data, offset, size, this->size()) && this->onUpdate(dc, data, offset, size);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
bool SkMeshPriv::UpdateGpuBuffer(GrDirectContext* dc,
sk_sp<GrGpuBuffer> buffer,
const void* data,
@@ -920,6 +920,6 @@
return true;
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
#endif // SK_ENABLE_SKSL
diff --git a/src/core/SkMeshPriv.h b/src/core/SkMeshPriv.h
index 04c6376..a4f50e9 100644
--- a/src/core/SkMeshPriv.h
+++ b/src/core/SkMeshPriv.h
@@ -14,7 +14,7 @@
#include "include/core/SkData.h"
#include "src/core/SkSLTypeShared.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrDirectContext.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
@@ -63,7 +63,7 @@
SkUNREACHABLE;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
static GrVertexAttribType AttrTypeAsVertexAttribType(Attribute::Type type) {
switch (type) {
case Attribute::Type::kFloat: return kFloat_GrVertexAttribType;
@@ -115,7 +115,7 @@
virtual const void* peek() const { return nullptr; }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
virtual sk_sp<const GrGpuBuffer> asGpuBuffer() const { return nullptr; }
#endif
};
@@ -144,7 +144,7 @@
using CpuIndexBuffer = CpuBuffer<IB>;
using CpuVertexBuffer = CpuBuffer<VB>;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
template <typename Base, GrGpuBufferType> class GpuBuffer final : public Base {
public:
GpuBuffer() = default;
@@ -166,10 +166,10 @@
using GpuIndexBuffer = GpuBuffer<IB, GrGpuBufferType::kIndex >;
using GpuVertexBuffer = GpuBuffer<VB, GrGpuBufferType::kVertex>;
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
private:
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
static bool UpdateGpuBuffer(GrDirectContext*,
sk_sp<GrGpuBuffer>,
const void*,
@@ -203,7 +203,7 @@
return true;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
template <typename Base, GrGpuBufferType Type> SkMeshPriv::GpuBuffer<Base, Type>::~GpuBuffer() {
GrResourceCache::ReturnResourceFromThread(std::move(fBuffer), fContextID);
@@ -243,7 +243,7 @@
return UpdateGpuBuffer(dc, fBuffer, data, offset, size);
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
#endif // SK_ENABLE_SKSL
diff --git a/src/core/SkModeColorFilter.cpp b/src/core/SkModeColorFilter.cpp
index 0a005e2..322db1b 100644
--- a/src/core/SkModeColorFilter.cpp
+++ b/src/core/SkModeColorFilter.cpp
@@ -19,7 +19,7 @@
#include "src/core/SkValidationUtils.h"
#include "src/core/SkWriteBuffer.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyContext.h"
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
@@ -43,13 +43,13 @@
bool onIsAlphaUnchanged() const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrFPResult asFragmentProcessor(std::unique_ptr<GrFragmentProcessor> inputFP,
GrRecordingContext*,
const GrColorInfo&,
const SkSurfaceProps&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
@@ -134,7 +134,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/Blend.h"
#include "src/gpu/ganesh/GrColorInfo.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
@@ -177,7 +177,7 @@
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkModeColorFilter::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const {
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 0dab276..6099437 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -22,7 +22,7 @@
#include <atomic>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/chromium/Slug.h"
#endif
diff --git a/src/core/SkPictureData.cpp b/src/core/SkPictureData.cpp
index b423b48..0c9e1c8 100644
--- a/src/core/SkPictureData.cpp
+++ b/src/core/SkPictureData.cpp
@@ -29,6 +29,10 @@
#include <cstring>
#include <utility>
+#if defined(SK_GANESH)
+#include "include/private/chromium/Slug.h"
+#endif
+
using namespace skia_private;
template <typename T> int SafeCount(const T* obj) {
@@ -52,7 +56,7 @@
, fTextBlobs(record.getTextBlobs())
, fVertices(record.getVertices())
, fImages(record.getImages())
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
, fSlugs(record.getSlugs())
#endif
, fInfo(info) {
@@ -181,7 +185,7 @@
}
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (!textBlobsOnly) {
write_tag_size(buffer, SK_PICT_SLUG_BUFFER_TAG, fSlugs.size());
for (const auto& slug : fSlugs) {
@@ -481,7 +485,7 @@
new_array_from_buffer(buffer, size, fTextBlobs, SkTextBlobPriv::MakeFromBuffer);
break;
case SK_PICT_SLUG_BUFFER_TAG:
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
new_array_from_buffer(buffer, size, fSlugs, sktext::gpu::Slug::MakeFromBuffer);
#endif
break;
diff --git a/src/core/SkPictureData.h b/src/core/SkPictureData.h
index 9226554..fe25a58 100644
--- a/src/core/SkPictureData.h
+++ b/src/core/SkPictureData.h
@@ -24,7 +24,7 @@
#include "src/core/SkPictureFlat.h"
#include "src/core/SkReadBuffer.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/chromium/Slug.h"
#endif
@@ -144,7 +144,7 @@
return read_index_base_1_or_null(reader, fTextBlobs);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
const sktext::gpu::Slug* getSlug(SkReadBuffer* reader) const {
return read_index_base_1_or_null(reader, fSlugs);
}
@@ -176,8 +176,8 @@
SkTArray<sk_sp<const SkTextBlob>> fTextBlobs;
SkTArray<sk_sp<const SkVertices>> fVertices;
SkTArray<sk_sp<const SkImage>> fImages;
-#if defined(SK_GANESH_ENABLED)
- SkTArray<sk_sp<const sktext::gpu::Slug>> fSlugs;
+#if defined(SK_GANESH)
+ SkTArray<sk_sp<const sktext::gpu::Slug>> fSlugs;
#endif
diff --git a/src/core/SkPictureImageGenerator.cpp b/src/core/SkPictureImageGenerator.cpp
index ab6092e..b31f244 100644
--- a/src/core/SkPictureImageGenerator.cpp
+++ b/src/core/SkPictureImageGenerator.cpp
@@ -15,7 +15,7 @@
#include "src/base/SkTLazy.h"
#include "src/image/SkImage_Base.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrTextureProxy.h"
#endif
@@ -27,12 +27,12 @@
protected:
bool onGetPixels(const SkImageInfo&, void* pixels, size_t rowBytes, const Options&) override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrSurfaceProxyView onGenerateTexture(GrRecordingContext*, const SkImageInfo&,
GrMipmapped, GrImageTexGenPolicy) override;
#endif
-#if SK_GRAPHITE_ENABLED
+#if SK_GRAPHITE
sk_sp<SkImage> onMakeTextureImage(skgpu::graphite::Recorder*,
const SkImageInfo&,
skgpu::Mipmapped) override;
@@ -102,7 +102,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
#include "src/gpu/ganesh/SkGr.h"
@@ -135,11 +135,11 @@
return view;
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
///////////////////////////////////////////////////////////////////////////////////////////////////
-#if SK_GRAPHITE_ENABLED
+#if SK_GRAPHITE
#include "src/gpu/graphite/Log.h"
sk_sp<SkImage> SkPictureImageGenerator::onMakeTextureImage(skgpu::graphite::Recorder* recorder,
@@ -158,4 +158,4 @@
return surface->asImage();
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp
index d582bfd..64c6ba2 100644
--- a/src/core/SkPicturePlayback.cpp
+++ b/src/core/SkPicturePlayback.cpp
@@ -38,7 +38,7 @@
#include "src/core/SkVerticesPriv.h"
#include "src/utils/SkPatchUtils.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/chromium/Slug.h"
#endif
@@ -633,7 +633,7 @@
canvas->drawTextBlob(blob, x, y, paint);
} break;
case DRAW_SLUG: {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
const sktext::gpu::Slug* slug = fPictureData->getSlug(reader);
BREAK_ON_READ_ERROR(reader);
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index badbaa4..8e035bb 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -20,7 +20,7 @@
#include "src/image/SkImage_Base.h"
#include "src/utils/SkPatchUtils.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/chromium/Slug.h"
#endif
@@ -581,7 +581,7 @@
this->validate(initialOffset, size);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void SkPictureRecord::onDrawSlug(const sktext::gpu::Slug* slug) {
// op + slug id
size_t size = 2 * kUInt32Size;
@@ -936,7 +936,7 @@
this->addInt(find_or_append(fTextBlobs, blob) + 1);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void SkPictureRecord::addSlug(const sktext::gpu::Slug* slug) {
// follow the convention of recording a 1-based index
this->addInt(find_or_append(fSlugs, slug) + 1);
diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h
index 3d7b1ef..045df76 100644
--- a/src/core/SkPictureRecord.h
+++ b/src/core/SkPictureRecord.h
@@ -48,7 +48,7 @@
return fTextBlobs;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
const SkTArray<sk_sp<const sktext::gpu::Slug>>& getSlugs() const {
return fSlugs;
}
@@ -180,7 +180,7 @@
void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
const SkPaint& paint) override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void onDrawSlug(const sktext::gpu::Slug* slug) override;
#endif
void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
@@ -256,7 +256,7 @@
SkTArray<sk_sp<SkDrawable>> fDrawables;
SkTArray<sk_sp<const SkTextBlob>> fTextBlobs;
SkTArray<sk_sp<const SkVertices>> fVertices;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
SkTArray<sk_sp<const sktext::gpu::Slug>> fSlugs;
#endif
diff --git a/src/core/SkPromiseImageTexture.cpp b/src/core/SkPromiseImageTexture.cpp
index b85dee8..7912c33 100644
--- a/src/core/SkPromiseImageTexture.cpp
+++ b/src/core/SkPromiseImageTexture.cpp
@@ -7,7 +7,7 @@
#include "include/core/SkPromiseImageTexture.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
SkPromiseImageTexture::SkPromiseImageTexture(const GrBackendTexture& backendTexture) {
SkASSERT(backendTexture.isValid());
@@ -16,4 +16,4 @@
SkPromiseImageTexture::~SkPromiseImageTexture() {}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
diff --git a/src/core/SkRecordDraw.cpp b/src/core/SkRecordDraw.cpp
index cde700c..1447cb0 100644
--- a/src/core/SkRecordDraw.cpp
+++ b/src/core/SkRecordDraw.cpp
@@ -139,7 +139,7 @@
DRAW(DrawRect, drawRect(r.rect, r.paint))
DRAW(DrawRegion, drawRegion(r.region, r.paint))
DRAW(DrawTextBlob, drawTextBlob(r.blob.get(), r.x, r.y, r.paint))
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
DRAW(DrawSlug, drawSlug(r.slug.get()))
#else
// Turn draw into a nop.
@@ -487,7 +487,7 @@
return this->adjustAndMap(dst, &op.paint);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
Bounds bounds(const DrawSlug& op) const {
SkRect dst = op.slug->sourceBoundsWithOrigin();
return this->adjustAndMap(dst, &op.slug->initialPaint());
diff --git a/src/core/SkRecordedDrawable.cpp b/src/core/SkRecordedDrawable.cpp
index ab6bd2a..0f24468 100644
--- a/src/core/SkRecordedDrawable.cpp
+++ b/src/core/SkRecordedDrawable.cpp
@@ -13,7 +13,7 @@
#include "src/core/SkRecordDraw.h"
#include "src/core/SkRecordedDrawable.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/chromium/Slug.h"
#endif
diff --git a/src/core/SkRecorder.cpp b/src/core/SkRecorder.cpp
index 1c2479c..b1eebde 100644
--- a/src/core/SkRecorder.cpp
+++ b/src/core/SkRecorder.cpp
@@ -34,7 +34,7 @@
#include "src/text/GlyphRun.h"
#include "src/utils/SkPatchUtils.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/chromium/Slug.h"
#endif
@@ -253,7 +253,7 @@
this->append<SkRecords::DrawTextBlob>(paint, sk_ref_sp(blob), x, y);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void SkRecorder::onDrawSlug(const sktext::gpu::Slug* slug) {
this->append<SkRecords::DrawSlug>(sk_ref_sp(slug));
}
diff --git a/src/core/SkRecorder.h b/src/core/SkRecorder.h
index 7f866b3..5ebab84 100644
--- a/src/core/SkRecorder.h
+++ b/src/core/SkRecorder.h
@@ -108,7 +108,7 @@
SkScalar x,
SkScalar y,
const SkPaint& paint) override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void onDrawSlug(const sktext::gpu::Slug* slug) override;
#endif
void onDrawGlyphRunList(
diff --git a/src/core/SkRecords.h b/src/core/SkRecords.h
index 27cba3a..4234077 100644
--- a/src/core/SkRecords.h
+++ b/src/core/SkRecords.h
@@ -27,7 +27,7 @@
#include "include/core/SkVertices.h"
#include "src/core/SkDrawShadowInfo.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/chromium/Slug.h"
#endif
@@ -300,7 +300,7 @@
sk_sp<const SkTextBlob> blob;
SkScalar x;
SkScalar y)
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
RECORD(DrawSlug, kDraw_Tag|kHasText_Tag,
sk_sp<const sktext::gpu::Slug> slug)
#else
diff --git a/src/core/SkRuntimeEffect.cpp b/src/core/SkRuntimeEffect.cpp
index d26ee79..182196f 100644
--- a/src/core/SkRuntimeEffect.cpp
+++ b/src/core/SkRuntimeEffect.cpp
@@ -42,7 +42,7 @@
#include "src/sksl/ir/SkSLVarDeclarations.h"
#include "src/sksl/tracing/SkVMDebugTrace.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/SkBackingFit.h"
#include "src/gpu/ganesh/GrCaps.h"
@@ -56,7 +56,7 @@
#include "src/image/SkImage_Gpu.h"
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyContext.h"
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
@@ -983,7 +983,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
static GrFPResult make_effect_fp(sk_sp<SkRuntimeEffect> effect,
const char* name,
sk_sp<const SkData> uniforms,
@@ -1041,7 +1041,7 @@
}
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
static void add_children_to_key(SkSpan<const SkRuntimeEffect::ChildPtr> children,
SkSpan<const SkRuntimeEffect::Child> childInfo,
const skgpu::graphite::KeyContext& keyContext,
@@ -1171,7 +1171,7 @@
, fUniforms(std::move(uniforms))
, fChildren(children.begin(), children.end()) {}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrFPResult asFragmentProcessor(std::unique_ptr<GrFragmentProcessor> inputFP,
GrRecordingContext* context,
const GrColorInfo& colorInfo,
@@ -1193,7 +1193,7 @@
}
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const override {
@@ -1376,7 +1376,7 @@
bool isOpaque() const override { return fEffect->alwaysOpaque(); }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs& args,
const MatrixRec& mRec) const override {
if (!SkRuntimeEffectPriv::CanDraw(args.fContext->priv().caps(), fEffect.get())) {
@@ -1410,7 +1410,7 @@
}
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const override {
@@ -1617,7 +1617,7 @@
src, dst, &callbacks);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
std::unique_ptr<GrFragmentProcessor> srcFP,
std::unique_ptr<GrFragmentProcessor> dstFP,
@@ -1643,7 +1643,7 @@
}
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer,
@@ -1775,7 +1775,7 @@
}
sk_sp<SkSurface> surface;
if (rContext) {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (!rContext->priv().caps()->mipmapSupport()) {
mipmapped = false;
}
diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp
index 8195e18..a635f35 100644
--- a/src/core/SkSpecialImage.cpp
+++ b/src/core/SkSpecialImage.cpp
@@ -18,7 +18,7 @@
#include "src/core/SkSurfacePriv.h"
#include "src/image/SkImage_Base.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/SkBackingFit.h"
@@ -86,7 +86,7 @@
return this->asShader(SkTileMode::kClamp, sampling, lm);
}
-#if SK_GRAPHITE_ENABLED
+#if SK_GRAPHITE
#include "src/gpu/graphite/TextureProxyView.h"
bool SkSpecialImage::isGraphiteBacked() const {
@@ -127,7 +127,7 @@
const SkSurfaceProps& props) {
SkASSERT(RectFits(subset, image->width(), image->height()));
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (rContext) {
auto [view, ct] = as_IB(image)->asView(rContext, GrMipmapped::kNo);
return MakeDeferredFromGpu(rContext,
@@ -173,7 +173,7 @@
return fBitmap.extractSubset(bm, this->subset());
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrSurfaceProxyView onView(GrRecordingContext* context) const override {
if (context) {
return std::get<0>(GrMakeCachedBitmapProxyView(
@@ -288,7 +288,7 @@
SkIRect::MakeWH(subset.width(), subset.height()), tmp, props);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
///////////////////////////////////////////////////////////////////////////////
static sk_sp<SkImage> wrap_proxy_in_image(GrRecordingContext* context,
GrSurfaceProxyView view,
diff --git a/src/core/SkSpecialImage.h b/src/core/SkSpecialImage.h
index 88445dc..06c9108 100644
--- a/src/core/SkSpecialImage.h
+++ b/src/core/SkSpecialImage.h
@@ -14,7 +14,7 @@
#include "include/core/SkSurfaceProps.h"
#include "src/core/SkNextID.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
#endif
@@ -98,7 +98,7 @@
static sk_sp<SkSpecialImage> CopyFromRaster(const SkIRect& subset,
const SkBitmap&,
const SkSurfaceProps&);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
static sk_sp<SkSpecialImage> MakeDeferredFromGpu(GrRecordingContext*,
const SkIRect& subset,
uint32_t uniqueID,
@@ -107,7 +107,7 @@
const SkSurfaceProps&);
#endif
-#if SK_GRAPHITE_ENABLED
+#if SK_GRAPHITE
static sk_sp<SkSpecialImage> MakeGraphite(skgpu::graphite::Recorder*,
const SkIRect& subset,
uint32_t uniqueID,
@@ -178,7 +178,7 @@
*/
GrRecordingContext* getContext() const { return this->onGetContext(); }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/**
* Regardless of how the underlying backing data is stored, returns the contents as a
* GrSurfaceProxyView. The returned view's proxy represents the entire backing image, so texture
@@ -188,7 +188,7 @@
GrSurfaceProxyView view(GrRecordingContext* context) const { return this->onView(context); }
#endif
-#if SK_GRAPHITE_ENABLED
+#if SK_GRAPHITE
bool isGraphiteBacked() const;
skgpu::graphite::TextureProxyView textureProxyView() const;
@@ -218,11 +218,11 @@
virtual GrRecordingContext* onGetContext() const { return nullptr; }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
virtual GrSurfaceProxyView onView(GrRecordingContext*) const = 0;
#endif
-#if SK_GRAPHITE_ENABLED
+#if SK_GRAPHITE
virtual skgpu::graphite::TextureProxyView onTextureProxyView() const;
#endif
diff --git a/src/core/SkSpecialSurface.cpp b/src/core/SkSpecialSurface.cpp
index 8f0301b..cc66c40 100644
--- a/src/core/SkSpecialSurface.cpp
+++ b/src/core/SkSpecialSurface.cpp
@@ -73,7 +73,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/SkBackingFit.h"
#include "src/gpu/ganesh/GrColorInfo.h"
@@ -105,10 +105,10 @@
return sk_make_sp<SkSpecialSurface>(std::move(device), subset);
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
///////////////////////////////////////////////////////////////////////////////
-#if SK_GRAPHITE_ENABLED
+#if SK_GRAPHITE
#include "src/gpu/graphite/Device.h"
sk_sp<SkSpecialSurface> SkSpecialSurface::MakeGraphite(skgpu::graphite::Recorder* recorder,
@@ -135,4 +135,4 @@
return sk_make_sp<SkSpecialSurface>(std::move(device), subset);
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
diff --git a/src/core/SkSpecialSurface.h b/src/core/SkSpecialSurface.h
index f75562f..3898127 100644
--- a/src/core/SkSpecialSurface.h
+++ b/src/core/SkSpecialSurface.h
@@ -13,11 +13,11 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkSurfaceProps.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#endif
-#if SK_GRAPHITE_ENABLED
+#if SK_GRAPHITE
namespace skgpu::graphite {
class Recorder;
}
@@ -66,7 +66,7 @@
*/
sk_sp<SkSpecialImage> makeImageSnapshot();
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/**
* Allocate a new GPU-backed SkSpecialSurface. If the requested surface cannot
* be created, nullptr will be returned.
@@ -77,7 +77,7 @@
GrSurfaceOrigin);
#endif
-#if SK_GRAPHITE_ENABLED
+#if SK_GRAPHITE
static sk_sp<SkSpecialSurface> MakeGraphite(skgpu::graphite::Recorder*,
const SkImageInfo&,
const SkSurfaceProps&);
diff --git a/src/core/SkStrike.cpp b/src/core/SkStrike.cpp
index dc9a363..da70d0f 100644
--- a/src/core/SkStrike.cpp
+++ b/src/core/SkStrike.cpp
@@ -20,7 +20,7 @@
#include "src/core/SkStrikeCache.h"
#include "src/text/StrikeForGPU.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/text/gpu/StrikeCache.h"
#endif
diff --git a/src/core/SkStrikeCache.cpp b/src/core/SkStrikeCache.cpp
index b71c579..31c4fe7 100644
--- a/src/core/SkStrikeCache.cpp
+++ b/src/core/SkStrikeCache.cpp
@@ -18,7 +18,7 @@
#include "src/core/SkGlyphBuffer.h"
#include "src/core/SkStrike.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/text/gpu/StrikeCache.h"
#endif
diff --git a/src/core/SkStrikeSpec.cpp b/src/core/SkStrikeSpec.cpp
index b234b2c..374f194 100644
--- a/src/core/SkStrikeSpec.cpp
+++ b/src/core/SkStrikeSpec.cpp
@@ -18,7 +18,7 @@
#include "src/core/SkStrike.h"
#include "src/core/SkStrikeCache.h"
-#if defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GANESH) || defined(SK_GRAPHITE)
#include "src/text/gpu/SDFMaskFilter.h"
#include "src/text/gpu/SDFTControl.h"
#include "src/text/gpu/StrikeCache.h"
@@ -154,7 +154,7 @@
SkMatrix::I());
}
-#if (defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)) && !defined(SK_DISABLE_SDF_TEXT)
+#if (defined(SK_GANESH) || defined(SK_GRAPHITE)) && !defined(SK_DISABLE_SDF_TEXT)
std::tuple<SkStrikeSpec, SkScalar, sktext::gpu::SDFTMatrixRange>
SkStrikeSpec::MakeSDFT(const SkFont& font, const SkPaint& paint,
const SkSurfaceProps& surfaceProps, const SkMatrix& deviceMatrix,
diff --git a/src/core/SkStrikeSpec.h b/src/core/SkStrikeSpec.h
index bfc70b4..dac2a5c 100644
--- a/src/core/SkStrikeSpec.h
+++ b/src/core/SkStrikeSpec.h
@@ -16,7 +16,7 @@
#include <tuple>
-#if defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GANESH) || defined(SK_GRAPHITE)
#include "src/text/gpu/SDFTControl.h"
namespace sktext::gpu {
@@ -76,7 +76,7 @@
// Make a strike spec for PDF Vector strikes
static SkStrikeSpec MakePDFVector(const SkTypeface& typeface, int* size);
-#if (defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)) && !defined(SK_DISABLE_SDF_TEXT)
+#if (defined(SK_GANESH) || defined(SK_GRAPHITE)) && !defined(SK_DISABLE_SDF_TEXT)
// Create a strike spec for scaled distance field text.
static std::tuple<SkStrikeSpec, SkScalar, sktext::gpu::SDFTMatrixRange> MakeSDFT(
const SkFont& font,
diff --git a/src/core/SkSurfaceCharacterization.cpp b/src/core/SkSurfaceCharacterization.cpp
index 2441dbe..707c55b 100644
--- a/src/core/SkSurfaceCharacterization.cpp
+++ b/src/core/SkSurfaceCharacterization.cpp
@@ -7,7 +7,7 @@
#include "include/core/SkSurfaceCharacterization.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h"
diff --git a/src/core/SkTextBlob.cpp b/src/core/SkTextBlob.cpp
index d97b1a4..b1dadfd 100644
--- a/src/core/SkTextBlob.cpp
+++ b/src/core/SkTextBlob.cpp
@@ -23,7 +23,7 @@
#include <limits>
#include <new>
-#if defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GANESH) || defined(SK_GRAPHITE)
#include "src/text/gpu/TextBlobRedrawCoordinator.h"
#endif
@@ -150,7 +150,7 @@
, fCacheID(SK_InvalidUniqueID) {}
SkTextBlob::~SkTextBlob() {
-#if defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GANESH) || defined(SK_GRAPHITE)
if (SK_InvalidUniqueID != fCacheID.load()) {
sktext::gpu::TextBlobRedrawCoordinator::PostPurgeBlobMessage(fUniqueID, fCacheID);
}
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index 59386d8..99684db 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -16,7 +16,7 @@
#include "src/core/SkWriteBuffer.h"
#include "src/core/SkXfermodePriv.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/effects/GrCustomXfermode.h"
#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h"
@@ -158,7 +158,7 @@
}
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
const GrXPFactory* SkBlendMode_AsXPFactory(SkBlendMode mode) {
if (SkBlendMode_AsCoeff(mode, nullptr, nullptr)) {
const GrXPFactory* result = GrPorterDuffXPFactory::Get(mode);
diff --git a/src/core/SkYUVAPixmaps.cpp b/src/core/SkYUVAPixmaps.cpp
index f03d653..308a575 100644
--- a/src/core/SkYUVAPixmaps.cpp
+++ b/src/core/SkYUVAPixmaps.cpp
@@ -11,13 +11,13 @@
#include "src/core/SkImageInfoPriv.h"
#include "src/core/SkYUVAInfoLocation.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/gpu/ganesh/GrImageContext.h"
#endif
SkYUVAPixmapInfo::SupportedDataTypes::SupportedDataTypes(const GrImageContext& context) {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
for (int n = 1; n <= 4; ++n) {
if (context.defaultBackendFormat(DefaultColorTypeForDataType(DataType::kUnorm8, n),
GrRenderable::kNo).isValid()) {
diff --git a/src/effects/SkShaderMaskFilter.cpp b/src/effects/SkShaderMaskFilter.cpp
index 1b216d1..d4b34f0 100644
--- a/src/effects/SkShaderMaskFilter.cpp
+++ b/src/effects/SkShaderMaskFilter.cpp
@@ -31,7 +31,7 @@
class SkMatrix;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrFragmentProcessor.h"
struct GrFPArgs;
#endif
@@ -52,7 +52,7 @@
bool asABlur(BlurRec*) const override { return false; }
protected:
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> onAsFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
bool onHasFragmentProcessor() const override;
@@ -134,7 +134,7 @@
}
///////////////////////////////////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor>
SkShaderMF::onAsFragmentProcessor(const GrFPArgs& args, const MatrixRec& mRec) const {
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index b198d4b..6b62a97 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -28,7 +28,7 @@
#include <tuple>
#include <utility>
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/Image_Graphite.h"
#include "src/gpu/graphite/KeyContext.h"
#include "src/gpu/graphite/KeyHelpers.h"
@@ -39,7 +39,7 @@
}
#endif
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GpuTypes.h"
#include "include/gpu/GrTypes.h"
#include "src/gpu/ganesh/GrColorInfo.h"
@@ -88,13 +88,13 @@
fBitmap.setImmutable();
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrFPResult asFragmentProcessor(std::unique_ptr<GrFragmentProcessor> inputFP,
GrRecordingContext*, const GrColorInfo&,
const SkSurfaceProps&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
@@ -157,7 +157,7 @@
return nullptr;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
class ColorTableEffect : public GrFragmentProcessor {
public:
@@ -290,9 +290,9 @@
return cte ? GrFPSuccess(std::move(cte)) : GrFPFailure(nullptr);
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkTable_ColorFilter::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
diff --git a/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp b/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp
index 6a94b4b..62d42a1 100644
--- a/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp
+++ b/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp
@@ -36,7 +36,7 @@
#include <memory>
#include <utility>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/SkBackingFit.h"
#include "src/gpu/ganesh/GrColorSpaceXform.h"
@@ -53,7 +53,7 @@
enum GrSurfaceOrigin : int;
enum class GrProtected : bool;
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
namespace {
@@ -72,7 +72,7 @@
sk_sp<SkSpecialImage> onFilterImage(const Context&, SkIPoint* offset) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrSurfaceProxyView createMaskTexture(GrRecordingContext*,
const SkMatrix&,
const SkIRect& bounds,
@@ -127,7 +127,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrSurfaceProxyView SkAlphaThresholdImageFilter::createMaskTexture(
GrRecordingContext* rContext,
const SkMatrix& inMatrix,
@@ -194,7 +194,7 @@
"innerThreshold", innerThreshold,
"outerThreshold", outerThreshold);
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
sk_sp<SkSpecialImage> SkAlphaThresholdImageFilter::onFilterImage(const Context& ctx,
SkIPoint* offset) const {
@@ -212,7 +212,7 @@
return nullptr;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (ctx.gpuBacked()) {
auto context = ctx.getContext();
diff --git a/src/effects/imagefilters/SkArithmeticImageFilter.cpp b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
index eda9ed8..c7fcb06 100644
--- a/src/effects/imagefilters/SkArithmeticImageFilter.cpp
+++ b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
@@ -40,7 +40,7 @@
#include <memory>
#include <utility>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GpuTypes.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/gpu/GrTypes.h"
@@ -73,7 +73,7 @@
SkIRect onFilterBounds(const SkIRect&, const SkMatrix& ctm,
MapDirection, const SkIRect* inputRect) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
sk_sp<SkSpecialImage> filterImageGPU(const Context& ctx,
sk_sp<SkSpecialImage> background,
const SkIPoint& backgroundOffset,
@@ -244,7 +244,7 @@
offset->fX = bounds.left();
offset->fY = bounds.top();
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (ctx.gpuBacked()) {
return this->filterImageGPU(ctx, background, backgroundOffset, foreground,
foregroundOffset, bounds);
@@ -328,7 +328,7 @@
return SkIRect::MakeEmpty();
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> make_arithmetic_fp(
std::unique_ptr<GrFragmentProcessor> srcFP,
diff --git a/src/effects/imagefilters/SkBlendImageFilter.cpp b/src/effects/imagefilters/SkBlendImageFilter.cpp
index 42acfe2..23080e2 100644
--- a/src/effects/imagefilters/SkBlendImageFilter.cpp
+++ b/src/effects/imagefilters/SkBlendImageFilter.cpp
@@ -36,7 +36,7 @@
#include <optional>
#include <utility>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/SkBackingFit.h"
#include "src/gpu/ganesh/GrColorSpaceXform.h"
@@ -68,7 +68,7 @@
SkIRect onFilterBounds(const SkIRect&, const SkMatrix& ctm,
MapDirection, const SkIRect* inputRect) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
sk_sp<SkSpecialImage> filterImageGPU(const Context& ctx,
sk_sp<SkSpecialImage> background,
const SkIPoint& backgroundOffset,
@@ -181,7 +181,7 @@
offset->fX = bounds.left();
offset->fY = bounds.top();
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (ctx.gpuBacked()) {
return this->filterImageGPU(ctx, background, backgroundOffset,
foreground, foregroundOffset, bounds);
@@ -272,7 +272,7 @@
canvas->drawPaint(paint);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
sk_sp<SkSpecialImage> SkBlendImageFilter::filterImageGPU(const Context& ctx,
sk_sp<SkSpecialImage> background,
diff --git a/src/effects/imagefilters/SkBlurImageFilter.cpp b/src/effects/imagefilters/SkBlurImageFilter.cpp
index 655baa0..d98673a 100644
--- a/src/effects/imagefilters/SkBlurImageFilter.cpp
+++ b/src/effects/imagefilters/SkBlurImageFilter.cpp
@@ -35,12 +35,12 @@
#include <memory>
#include <utility>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkGpuBlurUtils.h"
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
#include "src/gpu/ganesh/SurfaceDrawContext.h"
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
#include <xmmintrin.h>
@@ -73,7 +73,7 @@
friend void ::SkRegisterBlurImageFilterFlattenable();
SK_FLATTENABLE_HOOKS(SkBlurImageFilter)
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
sk_sp<SkSpecialImage> gpuFilter(
const Context& ctx, SkVector sigma,
const sk_sp<SkSpecialImage> &input,
@@ -959,7 +959,7 @@
SkScalarIsFinite(sigma.y()) && sigma.y() >= 0.f && sigma.y() <= kMaxSigma);
sk_sp<SkSpecialImage> result;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (ctx.gpuBacked()) {
// Ensure the input is in the destination's gamut. This saves us from having to do the
// xform during the filter itself.
@@ -980,7 +980,7 @@
return result;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
sk_sp<SkSpecialImage> SkBlurImageFilter::gpuFilter(
const Context& ctx, SkVector sigma, const sk_sp<SkSpecialImage> &input, SkIRect inputBounds,
SkIRect dstBounds, SkIPoint inputOffset, SkIPoint* offset) const {
diff --git a/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp b/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp
index c7df57d..5a8d10e 100644
--- a/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp
+++ b/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp
@@ -34,7 +34,7 @@
#include <memory>
#include <utility>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GpuTypes.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/gpu/GrTypes.h"
@@ -180,7 +180,7 @@
///////////////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
namespace {
@@ -314,7 +314,7 @@
SkVector scale = SkVector::Make(fScale, fScale);
ctx.ctm().mapVectors(&scale, 1);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (ctx.gpuBacked()) {
auto rContext = ctx.getContext();
@@ -431,7 +431,7 @@
///////////////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
class GrDisplacementMapEffect::Impl : public ProgramImpl {
public:
void emitCode(EmitArgs&) override;
diff --git a/src/effects/imagefilters/SkLightingImageFilter.cpp b/src/effects/imagefilters/SkLightingImageFilter.cpp
index 49a353b..a85a647 100644
--- a/src/effects/imagefilters/SkLightingImageFilter.cpp
+++ b/src/effects/imagefilters/SkLightingImageFilter.cpp
@@ -35,7 +35,7 @@
#include <memory>
#include <utility>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GpuTypes.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/gpu/GrTypes.h"
@@ -74,7 +74,7 @@
const SkScalar gOneHalf = 0.5f;
const SkScalar gOneQuarter = 0.25f;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
static void setUniformPoint3(const GrGLSLProgramDataManager& pdman, UniformHandle uni,
const SkPoint3& point) {
static_assert(sizeof(SkPoint3) == 3 * sizeof(float));
@@ -458,7 +458,7 @@
inline sk_sp<const SkImageFilterLight> refLight() const { return fLight; }
SkScalar surfaceScale() const { return fSurfaceScale; }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
sk_sp<SkSpecialImage> filterImageGPU(const Context& ctx,
SkSpecialImage* input,
const SkIRect& bounds,
@@ -472,7 +472,7 @@
#endif
private:
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void drawRect(skgpu::v1::SurfaceFillContext*,
GrSurfaceProxyView srcView,
const SkIPoint& viewOffset,
@@ -490,7 +490,7 @@
};
} // anonymous namespace
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void SkLightingImageFilterInternal::drawRect(skgpu::v1::SurfaceFillContext* sfc,
GrSurfaceProxyView srcView,
const SkIPoint& viewOffset,
@@ -596,7 +596,7 @@
sk_sp<SkSpecialImage> onFilterImage(const Context&, SkIPoint* offset) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> makeFragmentProcessor(GrSurfaceProxyView,
const SkIPoint& viewOffset,
const SkMatrix&,
@@ -632,7 +632,7 @@
sk_sp<SkSpecialImage> onFilterImage(const Context&, SkIPoint* offset) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> makeFragmentProcessor(GrSurfaceProxyView,
const SkIPoint& viewOffset,
const SkMatrix&,
@@ -651,7 +651,7 @@
using INHERITED = SkLightingImageFilterInternal;
};
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
class LightingEffect : public GrFragmentProcessor {
public:
@@ -917,7 +917,7 @@
LightType type() const override { return kDistant_LightType; }
const SkPoint3& direction() const { return fDirection; }
std::unique_ptr<GpuLight> createGpuLight() const override {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
return std::make_unique<GpuDistantLight>();
#else
SkDEBUGFAIL("Should not call in GPU-less build");
@@ -974,7 +974,7 @@
LightType type() const override { return kPoint_LightType; }
const SkPoint3& location() const { return fLocation; }
std::unique_ptr<GpuLight> createGpuLight() const override {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
return std::make_unique<GpuPointLight>();
#else
SkDEBUGFAIL("Should not call in GPU-less build");
@@ -1086,7 +1086,7 @@
return this->color().makeScale(scale);
}
std::unique_ptr<GpuLight> createGpuLight() const override {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
return std::make_unique<GpuSpotLight>();
#else
SkDEBUGFAIL("Should not call in GPU-less build");
@@ -1321,7 +1321,7 @@
offset->fY = bounds.top();
bounds.offset(-inputOffset);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (ctx.gpuBacked()) {
SkMatrix matrix(ctx.ctm());
matrix.postTranslate(SkIntToScalar(-offset->fX), SkIntToScalar(-offset->fY));
@@ -1372,7 +1372,7 @@
dst, ctx.surfaceProps());
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> SkDiffuseLightingImageFilter::makeFragmentProcessor(
GrSurfaceProxyView view,
const SkIPoint& viewOffset,
@@ -1464,7 +1464,7 @@
offset->fY = bounds.top();
bounds.offset(-inputOffset);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (ctx.gpuBacked()) {
SkMatrix matrix(ctx.ctm());
matrix.postTranslate(SkIntToScalar(-offset->fX), SkIntToScalar(-offset->fY));
@@ -1516,7 +1516,7 @@
ctx.surfaceProps());
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> SkSpecularLightingImageFilter::makeFragmentProcessor(
GrSurfaceProxyView view,
const SkIPoint& viewOffset,
@@ -1540,7 +1540,7 @@
///////////////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
static SkString emitNormalFunc(BoundaryMode mode,
const char* pointToNormalName,
diff --git a/src/effects/imagefilters/SkMagnifierImageFilter.cpp b/src/effects/imagefilters/SkMagnifierImageFilter.cpp
index f0d37ac..6220434 100644
--- a/src/effects/imagefilters/SkMagnifierImageFilter.cpp
+++ b/src/effects/imagefilters/SkMagnifierImageFilter.cpp
@@ -31,7 +31,7 @@
#include <memory>
#include <utility>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/core/SkRuntimeEffectPriv.h"
#include "src/gpu/ganesh/GrColorSpaceXform.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
@@ -109,7 +109,7 @@
////////////////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
static std::unique_ptr<GrFragmentProcessor> make_magnifier_fp(
std::unique_ptr<GrFragmentProcessor> input,
SkIRect bounds,
@@ -186,7 +186,7 @@
SkScalar invYZoom = fSrcRect.height() / bounds.height();
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (ctx.gpuBacked()) {
auto context = ctx.getContext();
diff --git a/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp b/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
index 0da083f..90833e1 100644
--- a/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
@@ -35,7 +35,7 @@
#include <utility>
class SkMatrix;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
@@ -380,7 +380,7 @@
}
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (ctx.gpuBacked()) {
auto context = ctx.getContext();
diff --git a/src/effects/imagefilters/SkMorphologyImageFilter.cpp b/src/effects/imagefilters/SkMorphologyImageFilter.cpp
index de39ed7..f0feac1 100644
--- a/src/effects/imagefilters/SkMorphologyImageFilter.cpp
+++ b/src/effects/imagefilters/SkMorphologyImageFilter.cpp
@@ -34,7 +34,7 @@
#include <memory>
#include <utility>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GpuTypes.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/gpu/GrTypes.h"
@@ -205,7 +205,7 @@
return src.makeOutset(SkScalarCeilToInt(radius.width()), SkScalarCeilToInt(radius.height()));
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
///////////////////////////////////////////////////////////////////////////////
/**
@@ -693,7 +693,7 @@
return input->makeSubset(srcBounds);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (ctx.gpuBacked()) {
auto context = ctx.getContext();
diff --git a/src/gpu/ganesh/GrDrawingManager.cpp b/src/gpu/ganesh/GrDrawingManager.cpp
index 9b3f330..c38e1b6 100644
--- a/src/gpu/ganesh/GrDrawingManager.cpp
+++ b/src/gpu/ganesh/GrDrawingManager.cpp
@@ -317,7 +317,7 @@
}));
SkASSERT(span.end() == fDAG.end() || fDAG[end]->blocksReordering());
-#if defined(SK_GANESH_ENABLED) && defined(SK_DEBUG)
+#if defined(SK_GANESH) && defined(SK_DEBUG)
// In order to partition the dag array like this it must be the case that each partition
// only depends on nodes in the partition or earlier partitions.
auto check = [&](const GrRenderTask* task, auto&& check) -> void {
diff --git a/src/gpu/graphite/Image_Base_Graphite.cpp b/src/gpu/graphite/Image_Base_Graphite.cpp
index ceb5e1b..6427a02 100644
--- a/src/gpu/graphite/Image_Base_Graphite.cpp
+++ b/src/gpu/graphite/Image_Base_Graphite.cpp
@@ -10,7 +10,7 @@
#include "include/core/SkColorSpace.h"
#include "src/gpu/graphite/Log.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#endif
@@ -50,7 +50,7 @@
callback(context, nullptr);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> Image_Base::onAsFragmentProcessor(
GrRecordingContext*,
SkSamplingOptions,
diff --git a/src/gpu/graphite/Image_Base_Graphite.h b/src/gpu/graphite/Image_Base_Graphite.h
index bf16fc1..25827b9 100644
--- a/src/gpu/graphite/Image_Base_Graphite.h
+++ b/src/gpu/graphite/Image_Base_Graphite.h
@@ -10,7 +10,7 @@
#include "src/image/SkImage_Base.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
#endif
@@ -68,7 +68,7 @@
private:
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> onAsFragmentProcessor(
GrRecordingContext*,
SkSamplingOptions,
diff --git a/src/gpu/graphite/SpecialImage_Graphite.cpp b/src/gpu/graphite/SpecialImage_Graphite.cpp
index 78ae066..77fe65f 100644
--- a/src/gpu/graphite/SpecialImage_Graphite.cpp
+++ b/src/gpu/graphite/SpecialImage_Graphite.cpp
@@ -48,7 +48,7 @@
sampling, paint, SkCanvas::kStrict_SrcRectConstraint);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrSurfaceProxyView onView(GrRecordingContext*) const override {
// To get here we would have to be requesting a Ganesh resource from a Graphite-backed
// special image. That should never happen.
diff --git a/src/gpu/graphite/Surface_Graphite.cpp b/src/gpu/graphite/Surface_Graphite.cpp
index cb339b6..25539a8 100644
--- a/src/gpu/graphite/Surface_Graphite.cpp
+++ b/src/gpu/graphite/Surface_Graphite.cpp
@@ -113,7 +113,7 @@
return fDevice->recorder()->priv().caps()->capabilities();
}
-#if GRAPHITE_TEST_UTILS && defined(SK_GANESH_ENABLED)
+#if GRAPHITE_TEST_UTILS && defined(SK_GANESH)
GrSemaphoresSubmitted Surface::onFlush(BackendSurfaceAccess,
const GrFlushInfo&,
const skgpu::MutableTextureState*) {
diff --git a/src/gpu/graphite/Surface_Graphite.h b/src/gpu/graphite/Surface_Graphite.h
index 48a31d6..b426673 100644
--- a/src/gpu/graphite/Surface_Graphite.h
+++ b/src/gpu/graphite/Surface_Graphite.h
@@ -59,7 +59,7 @@
TextureProxyView readSurfaceView() const;
-#if GRAPHITE_TEST_UTILS && defined(SK_GANESH_ENABLED)
+#if GRAPHITE_TEST_UTILS && defined(SK_GANESH)
// TODO: The long-term for the public API around surfaces and flushing/submitting will likely
// be replaced with explicit control over Recorders and submitting Recordings to the Context
// directly. For now, internal tools often rely on surface/canvas flushing to control what's
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index c05c6d7..24e72f5 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -38,7 +38,7 @@
#include "src/image/SkRescaleAndReadPixels.h"
#include "src/shaders/SkImageShader.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrRecordingContext.h"
@@ -60,7 +60,7 @@
enum class GrColorType;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/Image_Graphite.h"
#include "src/gpu/graphite/Log.h"
#endif
@@ -268,7 +268,7 @@
return nullptr;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
auto myContext = as_IB(this)->context();
// This check is also performed in the subclass, but we do it here for the short-circuit below.
if (myContext && !myContext->priv().matches(direct)) {
@@ -284,7 +284,7 @@
return as_IB(this)->onMakeSubset(subset, direct);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
bool SkImage::isTextureBacked() const {
return as_IB(this)->isGaneshBacked() || as_IB(this)->isGraphiteBacked();
@@ -377,7 +377,7 @@
callback(context, nullptr);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::tuple<GrSurfaceProxyView, GrColorType> SkImage_Base::asView(GrRecordingContext* context,
GrMipmapped mipmapped,
GrImageTexGenPolicy policy) const {
@@ -549,9 +549,9 @@
/*label=*/label);
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
std::tuple<skgpu::graphite::TextureProxyView, SkColorType> SkImage_Base::asView(
skgpu::graphite::Recorder* recorder,
skgpu::Mipmapped mipmapped) const {
@@ -610,10 +610,10 @@
requiredProps);
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
GrDirectContext* SkImage_Base::directContext() const {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
return GrAsDirectContext(this->context());
#else
return nullptr;
@@ -690,7 +690,7 @@
return nullptr;
}
sk_sp<SkSpecialImage> srcSpecialImage;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
auto myContext = as_IB(this)->context();
if (myContext && !myContext->priv().matches(rContext)) {
return nullptr;
@@ -763,7 +763,7 @@
return nullptr;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
auto myContext = as_IB(this)->context();
// This check is also performed in the subclass, but we do it here for the short-circuit below.
if (myContext && !myContext->priv().matches(dContext)) {
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index e7c2d03..64d5234 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -22,12 +22,12 @@
#include <string_view>
#include <tuple>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrTypes.h"
#include "src/gpu/ganesh/SkGr.h"
#endif
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
namespace skgpu {
namespace graphite {
class TextureProxyView;
@@ -109,7 +109,7 @@
/** this->context() try-casted to GrDirectContext. Useful for migrations – avoid otherwise! */
GrDirectContext* directContext() const;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
virtual GrSemaphoresSubmitted onFlush(GrDirectContext*, const GrFlushInfo&) const {
return GrSemaphoresSubmitted::kNo;
}
@@ -145,7 +145,7 @@
virtual GrBackendTexture onGetBackendTexture(bool flushPendingGrContextIO,
GrSurfaceOrigin* origin) const;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
// Returns a TextureProxyView representation of the image, if possible. This also returns
// a color type. This may be different than the image's color type when the image is not
// texture-backed and the capabilities of the GPU require a data type conversion to put
@@ -155,7 +155,7 @@
skgpu::Mipmapped) const;
#endif
-#if defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GANESH) || defined(SK_GRAPHITE)
virtual bool isYUVA() const { return false; }
#endif
@@ -204,7 +204,7 @@
return nullptr;
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
virtual sk_sp<SkImage> onMakeTextureImage(skgpu::graphite::Recorder*,
RequiredImageProperties) const = 0;
virtual sk_sp<SkImage> onMakeSubset(const SkIRect&,
@@ -219,7 +219,7 @@
protected:
SkImage_Base(const SkImageInfo& info, uint32_t uniqueID);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// Utility for making a copy of an existing view when the GrImageTexGenPolicy is not kDraw.
static GrSurfaceProxyView CopyView(GrRecordingContext*,
GrSurfaceProxyView src,
@@ -249,7 +249,7 @@
#endif
private:
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
virtual std::tuple<GrSurfaceProxyView, GrColorType> onAsView(
GrRecordingContext*,
GrMipmapped,
diff --git a/src/image/SkImage_GpuBase.cpp b/src/image/SkImage_GpuBase.cpp
index c0a28c9..903b03c 100644
--- a/src/image/SkImage_GpuBase.cpp
+++ b/src/image/SkImage_GpuBase.cpp
@@ -48,7 +48,7 @@
enum SkColorType : int;
struct SkIRect;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/Log.h"
#endif
@@ -183,7 +183,7 @@
this->imageInfo().colorInfo());
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
sk_sp<SkImage> SkImage_GpuBase::onMakeTextureImage(skgpu::graphite::Recorder*,
SkImage::RequiredImageProperties) const {
SKGPU_LOG_W("Cannot convert Ganesh-backed image to Graphite");
diff --git a/src/image/SkImage_GpuBase.h b/src/image/SkImage_GpuBase.h
index 4cf96de..657ec4c 100644
--- a/src/image/SkImage_GpuBase.h
+++ b/src/image/SkImage_GpuBase.h
@@ -74,7 +74,7 @@
sk_sp<GrImageContext> fContext;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
sk_sp<SkImage> onMakeTextureImage(skgpu::graphite::Recorder*,
RequiredImageProperties) const final;
sk_sp<SkImage> onMakeSubset(const SkIRect& subset,
diff --git a/src/image/SkImage_Lazy.cpp b/src/image/SkImage_Lazy.cpp
index dd57878..6597795 100644
--- a/src/image/SkImage_Lazy.cpp
+++ b/src/image/SkImage_Lazy.cpp
@@ -22,7 +22,7 @@
#include "src/core/SkResourceCache.h"
#include "src/core/SkYUVPlanesCache.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GpuTypes.h"
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrContextOptions.h"
@@ -52,7 +52,7 @@
#include "src/gpu/ganesh/effects/GrYUVtoRGBEffect.h"
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/TextureUtils.h"
#endif
@@ -202,7 +202,7 @@
}
bool SkImage_Lazy::readPixelsProxy(GrDirectContext* ctx, const SkPixmap& pixmap) const {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (!ctx) {
return false;
}
@@ -224,7 +224,7 @@
return sContext->readPixels(ctx, {this->imageInfo(), pixmap.writable_addr(), rowBytes}, {0, 0});
#else
return false;
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
}
//////////////////////////////////////////////////////////////////////////////////////////////////
@@ -263,7 +263,7 @@
// TODO: can we do this more efficiently, by telling the generator we want to
// "realize" a subset?
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
auto pixels = direct ? this->makeTextureImage(direct)
: this->makeRasterImage();
#else
@@ -272,7 +272,7 @@
return pixels ? pixels->makeSubset(subset, direct) : nullptr;
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
sk_sp<SkImage> SkImage_Lazy::onMakeSubset(const SkIRect& subset,
skgpu::graphite::Recorder* recorder,
@@ -286,7 +286,7 @@
return nonLazyImg ? nonLazyImg->makeSubset(subset, recorder, requiredProperties) : nullptr;
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
sk_sp<SkImage> SkImage_Lazy::onMakeColorTypeAndColorSpace(SkColorType targetCT,
sk_sp<SkColorSpace> targetCS,
@@ -330,7 +330,7 @@
return validator ? sk_make_sp<SkImage_Lazy>(&validator) : nullptr;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::tuple<GrSurfaceProxyView, GrColorType> SkImage_Lazy::onAsView(
GrRecordingContext* context,
@@ -618,9 +618,9 @@
void SkImage_Lazy::addUniqueIDListener(sk_sp<SkIDChangeListener> listener) const {
fUniqueIDListeners.add(std::move(listener));
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
/*
* We only have 2 ways to create a Graphite-backed image.
diff --git a/src/image/SkImage_Lazy.h b/src/image/SkImage_Lazy.h
index f97d7d2..f7b1b3a 100644
--- a/src/image/SkImage_Lazy.h
+++ b/src/image/SkImage_Lazy.h
@@ -23,7 +23,7 @@
#include <memory>
#include <tuple>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/core/SkYUVAPixmaps.h"
class GrCaps;
class GrDirectContext;
@@ -75,7 +75,7 @@
CachingHint) const override;
sk_sp<SkData> onRefEncoded() const override;
sk_sp<SkImage> onMakeSubset(const SkIRect&, GrDirectContext*) const override;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
sk_sp<SkImage> onMakeSubset(const SkIRect&,
skgpu::graphite::Recorder*,
RequiredImageProperties) const override;
@@ -92,7 +92,7 @@
bool onIsValid(GrRecordingContext*) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// Returns the texture proxy. CachingHint refers to whether the generator's output should be
// cached in CPU memory. We will always cache the generated texture on success.
GrSurfaceProxyView lockTextureProxyView(GrRecordingContext*,
@@ -109,7 +109,7 @@
private:
void addUniqueIDListener(sk_sp<SkIDChangeListener>) const;
bool readPixelsProxy(GrDirectContext*, const SkPixmap&) const;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::tuple<GrSurfaceProxyView, GrColorType> onAsView(GrRecordingContext*,
skgpu::Mipmapped,
GrImageTexGenPolicy) const override;
@@ -125,7 +125,7 @@
SkYUVAPixmaps* pixmaps) const;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
sk_sp<SkImage> onMakeTextureImage(skgpu::graphite::Recorder*,
RequiredImageProperties) const override;
#endif
@@ -142,7 +142,7 @@
mutable SkMutex fOnMakeColorTypeAndSpaceMutex;
mutable sk_sp<SkImage> fOnMakeColorTypeAndSpaceResult;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// When the SkImage_Lazy goes away, we will iterate over all the listeners to inform them
// of the unique ID's demise. This is used to remove cached textures from GrContext.
mutable SkIDChangeListener::List fUniqueIDListeners;
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index 0bda72c..f84ba01 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -40,7 +40,7 @@
class SkMatrix;
enum class SkTileMode;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GpuTypes.h"
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrRecordingContext.h"
@@ -52,7 +52,7 @@
#include "src/gpu/ganesh/SkGr.h"
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/GraphiteTypes.h"
#include "include/gpu/graphite/Recorder.h"
#include "src/gpu/graphite/Buffer.h"
@@ -124,7 +124,7 @@
bool getROPixels(GrDirectContext*, SkBitmap*, CachingHint) const override;
sk_sp<SkImage> onMakeSubset(const SkIRect&, GrDirectContext*) const override;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
sk_sp<SkImage> onMakeSubset(const SkIRect&,
skgpu::graphite::Recorder*,
RequiredImageProperties) const override;
@@ -155,7 +155,7 @@
fBitmap.pixelRef()->notifyAddedToCache();
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
bool onPinAsTexture(GrRecordingContext*) const override;
void onUnpinAsTexture(GrRecordingContext*) const override;
bool isPinnedOnContext(GrRecordingContext*) const override;
@@ -183,7 +183,7 @@
}
private:
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::tuple<GrSurfaceProxyView, GrColorType> onAsView(GrRecordingContext*,
GrMipmapped,
GrImageTexGenPolicy) const override;
@@ -195,7 +195,7 @@
const SkRect*,
const SkRect*) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
sk_sp<SkImage> onMakeTextureImage(skgpu::graphite::Recorder*,
RequiredImageProperties) const override;
sk_sp<SkImage> onMakeColorTypeAndColorSpace(SkColorType targetCT,
@@ -206,7 +206,7 @@
SkBitmap fBitmap;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
mutable GrSurfaceProxyView fPinnedView;
mutable int32_t fPinnedCount = 0;
mutable uint32_t fPinnedUniqueID = SK_InvalidUniqueID;
@@ -234,7 +234,7 @@
}
SkImage_Raster::~SkImage_Raster() {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
SkASSERT(!fPinnedView); // want the caller to have manually unpinned
#endif
}
@@ -259,7 +259,7 @@
return true;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
bool SkImage_Raster::onPinAsTexture(GrRecordingContext* rContext) const {
if (fPinnedView) {
SkASSERT(fPinnedCount > 0);
@@ -340,7 +340,7 @@
}
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
static sk_sp<SkMipmap> copy_mipmaps(const SkBitmap& src, SkMipmap* srcMips) {
if (!srcMips) {
return nullptr;
@@ -397,7 +397,7 @@
return img;
}
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
///////////////////////////////////////////////////////////////////////////////
@@ -542,7 +542,7 @@
return SkImage::MakeRasterCopy(pixmap);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::tuple<GrSurfaceProxyView, GrColorType> SkImage_Raster::onAsView(
GrRecordingContext* rContext,
GrMipmapped mipmapped,
@@ -605,7 +605,7 @@
}
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
sk_sp<SkImage> SkImage_Raster::onMakeTextureImage(skgpu::graphite::Recorder* recorder,
RequiredImageProperties requiredProps) const {
return skgpu::graphite::MakeFromBitmap(recorder,
diff --git a/src/image/SkSurface.cpp b/src/image/SkSurface.cpp
index 66e566a..d0139a9 100644
--- a/src/image/SkSurface.cpp
+++ b/src/image/SkSurface.cpp
@@ -41,7 +41,7 @@
namespace skgpu { class MutableTextureState; }
namespace skgpu { namespace graphite { class Recorder; } }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrBackendSurface.h"
#endif
@@ -69,7 +69,7 @@
if (fCachedCanvas) {
fCachedCanvas->setSurfaceBase(nullptr);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (fCachedImage) {
as_IB(fCachedImage.get())->generatingSurfaceIsDeleted();
}
@@ -84,7 +84,7 @@
return nullptr;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrBackendTexture SkSurface_Base::onGetBackendTexture(BackendHandleAccess) {
return GrBackendTexture(); // invalid
}
@@ -252,7 +252,7 @@
}
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/Log.h"
sk_sp<SkImage> SkSurface::asImage() {
@@ -399,7 +399,7 @@
return asSB(this)->onDraw(std::move(ddl), { xOffset, yOffset });
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrBackendTexture SkSurface::getBackendTexture(BackendHandleAccess access) {
return asSB(this)->onGetBackendTexture(access);
}
diff --git a/src/image/SkSurface_Base.h b/src/image/SkSurface_Base.h
index 6beb168..e2f7b83 100644
--- a/src/image/SkSurface_Base.h
+++ b/src/image/SkSurface_Base.h
@@ -23,7 +23,7 @@
virtual GrRecordingContext* onGetRecordingContext();
virtual skgpu::graphite::Recorder* onGetRecorder();
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
virtual GrBackendTexture onGetBackendTexture(BackendHandleAccess);
virtual GrBackendRenderTarget onGetBackendRenderTarget(BackendHandleAccess);
virtual bool onReplaceBackendTexture(const GrBackendTexture&,
@@ -66,7 +66,7 @@
*/
virtual sk_sp<SkImage> onNewImageSnapshot(const SkIRect* subset = nullptr) { return nullptr; }
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
virtual sk_sp<SkImage> onAsImage() { return nullptr; }
virtual sk_sp<SkImage> onMakeImageCopy(const SkIRect* /* subset */,
diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp
index dcbaa05..5564b70 100644
--- a/src/image/SkSurface_Gpu.cpp
+++ b/src/image/SkSurface_Gpu.cpp
@@ -7,7 +7,7 @@
#include "src/image/SkSurface_Gpu.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/core/SkCanvas.h"
#include "include/core/SkColorSpace.h"
diff --git a/src/image/SkSurface_Gpu.h b/src/image/SkSurface_Gpu.h
index 01bfff3..924e962 100644
--- a/src/image/SkSurface_Gpu.h
+++ b/src/image/SkSurface_Gpu.h
@@ -10,7 +10,7 @@
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/core/SkImageInfo.h"
#include "include/core/SkRefCnt.h"
#include "include/core/SkSamplingOptions.h"
@@ -90,6 +90,6 @@
using INHERITED = SkSurface_Base;
};
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
#endif // SkSurface_Gpu_DEFINED
diff --git a/src/image/SkSurface_GpuMtl.mm b/src/image/SkSurface_GpuMtl.mm
index 9b56f9a..8e44360 100644
--- a/src/image/SkSurface_GpuMtl.mm
+++ b/src/image/SkSurface_GpuMtl.mm
@@ -16,7 +16,7 @@
#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/image/SkSurface_Gpu.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrSurface.h"
#include "src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.h"
diff --git a/src/shaders/SkColorFilterShader.cpp b/src/shaders/SkColorFilterShader.cpp
index 63553e4..7ff7e8d 100644
--- a/src/shaders/SkColorFilterShader.cpp
+++ b/src/shaders/SkColorFilterShader.cpp
@@ -15,12 +15,12 @@
#include "src/core/SkWriteBuffer.h"
#include "src/shaders/SkColorFilterShader.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrFPArgs.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
#endif
@@ -94,7 +94,7 @@
return fFilter->program(p,c, dst, uniforms,alloc);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/////////////////////////////////////////////////////////////////////
std::unique_ptr<GrFragmentProcessor>
@@ -117,7 +117,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkColorFilterShader::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
diff --git a/src/shaders/SkColorFilterShader.h b/src/shaders/SkColorFilterShader.h
index a051a9e..4cdbea6 100644
--- a/src/shaders/SkColorFilterShader.h
+++ b/src/shaders/SkColorFilterShader.h
@@ -17,11 +17,11 @@
public:
SkColorFilterShader(sk_sp<SkShader> shader, float alpha, sk_sp<SkColorFilter> filter);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
diff --git a/src/shaders/SkColorShader.cpp b/src/shaders/SkColorShader.cpp
index 5584070..149b155 100644
--- a/src/shaders/SkColorShader.cpp
+++ b/src/shaders/SkColorShader.cpp
@@ -17,7 +17,7 @@
#include "src/core/SkWriteBuffer.h"
#include "src/shaders/SkShaderBase.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
#endif
@@ -40,12 +40,12 @@
GradientType asGradient(GradientInfo* info, SkMatrix* localMatrix) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
@@ -83,11 +83,11 @@
bool isOpaque() const override { return fColor.isOpaque(); }
bool isConstant() const override { return true; }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
@@ -212,7 +212,7 @@
return p->uniformColor(color, uniforms);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrColorInfo.h"
#include "src/gpu/ganesh/GrColorSpaceXform.h"
@@ -236,7 +236,7 @@
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkColorShader::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const {
diff --git a/src/shaders/SkComposeShader.cpp b/src/shaders/SkComposeShader.cpp
index 7332f79..ee9a1ed 100644
--- a/src/shaders/SkComposeShader.cpp
+++ b/src/shaders/SkComposeShader.cpp
@@ -20,7 +20,7 @@
#include "src/core/SkWriteBuffer.h"
#include "src/shaders/SkShaderBase.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/Blend.h"
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
@@ -33,12 +33,12 @@
, fSrc(std::move(src))
, fMode(mode) {}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
@@ -155,7 +155,7 @@
return {};
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/ganesh/GrFPArgs.h"
@@ -174,7 +174,7 @@
}
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkShader_Blend::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const {
diff --git a/src/shaders/SkCoordClampShader.cpp b/src/shaders/SkCoordClampShader.cpp
index 9b1c88d..f681942 100644
--- a/src/shaders/SkCoordClampShader.cpp
+++ b/src/shaders/SkCoordClampShader.cpp
@@ -14,7 +14,7 @@
#include "src/core/SkWriteBuffer.h"
#include "src/shaders/SkShaderBase.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/effects/SkRuntimeEffect.h"
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/ganesh/GrFPArgs.h"
@@ -28,7 +28,7 @@
SkShader_CoordClamp(sk_sp<SkShader> shader, const SkRect& subset)
: fShader(std::move(shader)), fSubset(subset) {}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
@@ -107,7 +107,7 @@
return as_SB(fShader)->program(p, device, local, paint, *childMRec, cinfo, uniforms, alloc);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> SkShader_CoordClamp::asFragmentProcessor(
const GrFPArgs& args, const MatrixRec& mRec) const {
static const SkRuntimeEffect* effect = SkMakeRuntimeEffect(SkRuntimeEffect::MakeForShader,
@@ -139,7 +139,7 @@
std::tie(success, fp) = mRec.apply(std::move(fp));
return success ? std::move(fp) : nullptr;
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
void SkRegisterCoordClampShaderFlattenable() { SK_REGISTER_FLATTENABLE(SkShader_CoordClamp); }
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index 1741ce7..d11304a 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -24,7 +24,7 @@
#include "src/shaders/SkLocalMatrixShader.h"
#include "src/shaders/SkTransformShader.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/ImageUtils.h"
#include "src/gpu/graphite/Image_Graphite.h"
#include "src/gpu/graphite/KeyContext.h"
@@ -364,7 +364,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrColorInfo.h"
#include "src/gpu/ganesh/GrFPArgs.h"
@@ -406,7 +406,7 @@
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkImageShader::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const {
diff --git a/src/shaders/SkImageShader.h b/src/shaders/SkImageShader.h
index a0af8a6..3740aec 100644
--- a/src/shaders/SkImageShader.h
+++ b/src/shaders/SkImageShader.h
@@ -56,11 +56,11 @@
bool isOpaque() const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
diff --git a/src/shaders/SkLocalMatrixShader.cpp b/src/shaders/SkLocalMatrixShader.cpp
index 6847088..ceddf24 100644
--- a/src/shaders/SkLocalMatrixShader.cpp
+++ b/src/shaders/SkLocalMatrixShader.cpp
@@ -10,13 +10,13 @@
#include "src/core/SkVM.h"
#include "src/shaders/SkLocalMatrixShader.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrFPArgs.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/effects/GrMatrixEffect.h"
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyContext.h"
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
@@ -31,14 +31,14 @@
return type;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> SkLocalMatrixShader::asFragmentProcessor(
const GrFPArgs& args, const MatrixRec& mRec) const {
return as_SB(fWrappedShader)->asFragmentProcessor(args, mRec.concat(fLocalMatrix));
}
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkLocalMatrixShader::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const {
@@ -158,7 +158,7 @@
return as_SB(fProxyShader)->asGradient(info, localMatrix);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
@@ -191,7 +191,7 @@
};
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> SkCTMShader::asFragmentProcessor(const GrFPArgs& args,
const MatrixRec& mRec) const {
SkMatrix ctmInv;
diff --git a/src/shaders/SkLocalMatrixShader.h b/src/shaders/SkLocalMatrixShader.h
index a48e7c6..e4b1866 100644
--- a/src/shaders/SkLocalMatrixShader.h
+++ b/src/shaders/SkLocalMatrixShader.h
@@ -32,11 +32,11 @@
GradientType asGradient(GradientInfo* info, SkMatrix* localMatrix) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp
index c901aa9..0842292 100644
--- a/src/shaders/SkPerlinNoiseShader.cpp
+++ b/src/shaders/SkPerlinNoiseShader.cpp
@@ -19,7 +19,7 @@
#include "src/core/SkVM.h"
#include "src/core/SkWriteBuffer.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/KeyBuilder.h"
#include "src/gpu/ganesh/GrFPArgs.h"
@@ -89,7 +89,7 @@
this->stitch();
}
- #if defined(SK_GANESH_ENABLED)
+ #if defined(SK_GANESH)
SkImageInfo info = SkImageInfo::MakeA8(kBlockSize, 1);
fPermutationsBitmap.installPixels(info, fLatticeSelector, info.minRowBytes());
fPermutationsBitmap.setImmutable();
@@ -100,7 +100,7 @@
#endif
}
- #if defined(SK_GANESH_ENABLED)
+ #if defined(SK_GANESH)
PaintingData(const PaintingData& that)
: fSeed(that.fSeed)
, fTileSize(that.fTileSize)
@@ -124,7 +124,7 @@
private:
- #if defined(SK_GANESH_ENABLED)
+ #if defined(SK_GANESH)
SkBitmap fPermutationsBitmap;
SkBitmap fNoiseBitmap;
#endif
@@ -252,7 +252,7 @@
public:
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
const SkBitmap& getPermutationsBitmap() const { return fPermutationsBitmap; }
const SkBitmap& getNoiseBitmap() const { return fNoiseBitmap; }
@@ -300,7 +300,7 @@
using INHERITED = Context;
};
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
@@ -573,7 +573,7 @@
/////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
class GrPerlinNoise2Effect : public GrFragmentProcessor {
public:
diff --git a/src/shaders/SkPictureShader.cpp b/src/shaders/SkPictureShader.cpp
index efd961b..b65b1bc 100644
--- a/src/shaders/SkPictureShader.cpp
+++ b/src/shaders/SkPictureShader.cpp
@@ -25,7 +25,7 @@
#include "src/shaders/SkImageShader.h"
#include "src/shaders/SkLocalMatrixShader.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/ganesh/GrCaps.h"
@@ -39,7 +39,7 @@
#include "src/shaders/SkLocalMatrixShader.h"
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/Caps.h"
#include "src/gpu/graphite/KeyContext.h"
#include "src/gpu/graphite/KeyHelpers.h"
@@ -362,7 +362,7 @@
/////////////////////////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrProxyProvider.h"
@@ -445,7 +445,7 @@
}
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkPictureShader::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const {
@@ -498,4 +498,4 @@
as_SB(shader)->addToKey(keyContext, builder, gatherer);
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
diff --git a/src/shaders/SkPictureShader.h b/src/shaders/SkPictureShader.h
index 2a5751f..3f2942b 100644
--- a/src/shaders/SkPictureShader.h
+++ b/src/shaders/SkPictureShader.h
@@ -27,11 +27,11 @@
static sk_sp<SkShader> Make(sk_sp<SkPicture>, SkTileMode, SkTileMode, SkFilterMode,
const SkMatrix*, const SkRect*);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
diff --git a/src/shaders/SkShader.cpp b/src/shaders/SkShader.cpp
index fa37073..a9ab7bb 100644
--- a/src/shaders/SkShader.cpp
+++ b/src/shaders/SkShader.cpp
@@ -21,12 +21,12 @@
#include "src/shaders/SkShaderBase.h"
#include "src/shaders/SkTransformShader.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/effects/GrMatrixEffect.h"
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
#endif
@@ -81,7 +81,7 @@
/*ctmApplied=*/true};
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrFPResult SkShaderBase::MatrixRec::apply(std::unique_ptr<GrFragmentProcessor> fp,
const SkMatrix& postInv) const {
// FP matrices work differently than SkRasterPipeline and SkVM. The starting coordinates
@@ -179,7 +179,7 @@
return as_SB(this)->onIsAImage(localMatrix, xy);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor>
SkShaderBase::asRootFragmentProcessor(const GrFPArgs& args, const SkMatrix& ctm) const {
return this->asFragmentProcessor(args, MatrixRec(ctm));
@@ -195,7 +195,7 @@
return nullptr;
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
// TODO: add implementations for derived classes
void SkShaderBase::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
diff --git a/src/shaders/SkShaderBase.h b/src/shaders/SkShaderBase.h
index 3c9af35..5addf0c 100644
--- a/src/shaders/SkShaderBase.h
+++ b/src/shaders/SkShaderBase.h
@@ -37,7 +37,7 @@
class PipelineDataGatherer;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
using GrFPResult = std::tuple<bool /*success*/, std::unique_ptr<GrFragmentProcessor>>;
#endif
@@ -238,7 +238,7 @@
skvm::Uniforms*,
const SkMatrix& postInv = {}) const;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/**
* Produces an FP that muls its input coords by the inverse of the pending matrix and then
* samples the passed FP with those coordinates. 'postInv' is an additional matrix to
@@ -330,7 +330,7 @@
*/
Context* makeContext(const ContextRec&, SkArenaAlloc*) const;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/**
* Call on the root SkShader to produce a GrFragmentProcessor.
*
@@ -427,7 +427,7 @@
skvm::Uniforms*,
SkArenaAlloc*) const = 0;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
/**
Add implementation details, for the specified backend, of this SkShader to the
provided key.
diff --git a/src/shaders/gradients/SkGradientShaderBase.cpp b/src/shaders/gradients/SkGradientShaderBase.cpp
index 15c9e0e..87b6d91 100644
--- a/src/shaders/gradients/SkGradientShaderBase.cpp
+++ b/src/shaders/gradients/SkGradientShaderBase.cpp
@@ -18,7 +18,7 @@
#include "src/core/SkVM.h"
#include "src/core/SkWriteBuffer.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/core/SkColorSpacePriv.h"
#include "src/gpu/graphite/KeyContext.h"
#include "src/gpu/graphite/KeyHelpers.h"
@@ -1270,7 +1270,7 @@
}
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
// Please see GrGradientShader.cpp::make_interpolated_to_dst for substantial comments
// as to why this code is structured this way.
void SkGradientShaderBase::MakeInterpolatedToDst(
diff --git a/src/shaders/gradients/SkGradientShaderBase.h b/src/shaders/gradients/SkGradientShaderBase.h
index 4e4effa..fc677cf 100644
--- a/src/shaders/gradients/SkGradientShaderBase.h
+++ b/src/shaders/gradients/SkGradientShaderBase.h
@@ -16,7 +16,7 @@
#include "src/core/SkVM.h"
#include "src/shaders/SkShaderBase.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyHelpers.h"
#endif
@@ -119,7 +119,7 @@
const SkMatrix fPtsToUnit;
SkTileMode fTileMode;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
static void MakeInterpolatedToDst(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*,
diff --git a/src/shaders/gradients/SkLinearGradient.cpp b/src/shaders/gradients/SkLinearGradient.cpp
index a93e2a8..a714455 100644
--- a/src/shaders/gradients/SkLinearGradient.cpp
+++ b/src/shaders/gradients/SkLinearGradient.cpp
@@ -11,7 +11,7 @@
#include "src/core/SkWriteBuffer.h"
#include "src/shaders/SkLocalMatrixShader.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyContext.h"
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
@@ -89,7 +89,7 @@
/////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/gradients/GrGradientShader.h"
@@ -100,7 +100,7 @@
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkLinearGradient::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const {
diff --git a/src/shaders/gradients/SkLinearGradient.h b/src/shaders/gradients/SkLinearGradient.h
index c792de7..48a340e 100644
--- a/src/shaders/gradients/SkLinearGradient.h
+++ b/src/shaders/gradients/SkLinearGradient.h
@@ -15,11 +15,11 @@
SkLinearGradient(const SkPoint pts[2], const Descriptor&);
GradientType asGradient(GradientInfo* info, SkMatrix* localMatrix) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
diff --git a/src/shaders/gradients/SkRadialGradient.cpp b/src/shaders/gradients/SkRadialGradient.cpp
index 4262bcc..89760ac 100644
--- a/src/shaders/gradients/SkRadialGradient.cpp
+++ b/src/shaders/gradients/SkRadialGradient.cpp
@@ -10,7 +10,7 @@
#include "src/core/SkWriteBuffer.h"
#include "src/shaders/SkLocalMatrixShader.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyContext.h"
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
@@ -37,11 +37,11 @@
SkRadialGradient(const SkPoint& center, SkScalar radius, const Descriptor&);
GradientType asGradient(GradientInfo* info, SkMatrix* matrix) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
@@ -120,7 +120,7 @@
/////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/core/SkRuntimeEffectPriv.h"
#include "src/gpu/ganesh/effects/GrSkSLFP.h"
@@ -141,7 +141,7 @@
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkRadialGradient::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const {
diff --git a/src/shaders/gradients/SkSweepGradient.cpp b/src/shaders/gradients/SkSweepGradient.cpp
index 6a7124d..f45be27 100644
--- a/src/shaders/gradients/SkSweepGradient.cpp
+++ b/src/shaders/gradients/SkSweepGradient.cpp
@@ -11,7 +11,7 @@
#include "src/core/SkWriteBuffer.h"
#include "src/shaders/SkLocalMatrixShader.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyContext.h"
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
@@ -25,11 +25,11 @@
GradientType asGradient(GradientInfo* info, SkMatrix* localMatrix) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
@@ -146,7 +146,7 @@
/////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/core/SkRuntimeEffectPriv.h"
#include "src/gpu/ganesh/GrCaps.h"
@@ -190,7 +190,7 @@
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkSweepGradient::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const {
diff --git a/src/shaders/gradients/SkTwoPointConicalGradient.cpp b/src/shaders/gradients/SkTwoPointConicalGradient.cpp
index 1f9bb77..4b57819 100644
--- a/src/shaders/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/shaders/gradients/SkTwoPointConicalGradient.cpp
@@ -14,7 +14,7 @@
#include <utility>
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyContext.h"
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
@@ -60,11 +60,11 @@
const Descriptor&, const SkMatrix* localMatrix);
GradientType asGradient(GradientInfo* info, SkMatrix* localMatrix) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&,
const MatrixRec&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
@@ -372,7 +372,7 @@
/////////////////////////////////////////////////////////////////////
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/core/SkRuntimeEffectPriv.h"
#include "src/gpu/ganesh/effects/GrSkSLFP.h"
@@ -536,7 +536,7 @@
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkTwoPointConicalGradient::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
skgpu::graphite::PipelineDataGatherer* gatherer) const {
diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index 66e407f..9321d58 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -46,7 +46,7 @@
#include <fstream>
#endif
-#if defined(SKSL_STANDALONE) || defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)
+#if defined(SKSL_STANDALONE) || defined(SK_GANESH) || defined(SK_GRAPHITE)
#include "src/sksl/codegen/SkSLGLSLCodeGenerator.h"
#include "src/sksl/codegen/SkSLMetalCodeGenerator.h"
#include "src/sksl/codegen/SkSLSPIRVCodeGenerator.h"
@@ -459,7 +459,7 @@
return this->errorCount() == 0;
}
-#if defined(SKSL_STANDALONE) || defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)
+#if defined(SKSL_STANDALONE) || defined(SK_GANESH) || defined(SK_GRAPHITE)
#if defined(SK_ENABLE_SPIRV_VALIDATION)
static bool validate_spirv(ErrorReporter& reporter, std::string_view program) {
@@ -629,7 +629,7 @@
return result;
}
-#endif // defined(SKSL_STANDALONE) || defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)
+#endif // defined(SKSL_STANDALONE) || defined(SK_GANESH) || defined(SK_GRAPHITE)
void Compiler::handleError(std::string_view msg, Position pos) {
fErrorText += "error: ";
diff --git a/src/sksl/SkSLMemoryPool.h b/src/sksl/SkSLMemoryPool.h
index cefef95..0d16d84 100644
--- a/src/sksl/SkSLMemoryPool.h
+++ b/src/sksl/SkSLMemoryPool.h
@@ -12,7 +12,7 @@
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrMemoryPool.h"
@@ -40,5 +40,5 @@
} // namespace SkSL
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
#endif // SKSL_MEMORYPOOL
diff --git a/src/sksl/SkSLModuleLoader.cpp b/src/sksl/SkSLModuleLoader.cpp
index da9227c..b5cc5eb 100644
--- a/src/sksl/SkSLModuleLoader.cpp
+++ b/src/sksl/SkSLModuleLoader.cpp
@@ -62,7 +62,7 @@
#include "src/sksl/generated/sksl_public.minified.sksl"
#include "src/sksl/generated/sksl_rt_shader.minified.sksl"
#include "src/sksl/generated/sksl_vert.minified.sksl"
- #if defined(SK_GRAPHITE_ENABLED)
+ #if defined(SK_GRAPHITE)
#include "src/sksl/generated/sksl_graphite_frag.minified.sksl"
#include "src/sksl/generated/sksl_graphite_vert.minified.sksl"
#endif
@@ -74,7 +74,7 @@
#include "src/sksl/generated/sksl_public.unoptimized.sksl"
#include "src/sksl/generated/sksl_rt_shader.unoptimized.sksl"
#include "src/sksl/generated/sksl_vert.unoptimized.sksl"
- #if defined(SK_GRAPHITE_ENABLED)
+ #if defined(SK_GRAPHITE)
#include "src/sksl/generated/sksl_graphite_frag.unoptimized.sksl"
#include "src/sksl/generated/sksl_graphite_vert.unoptimized.sksl"
#endif
@@ -386,7 +386,7 @@
}
const Module* ModuleLoader::loadGraphiteFragmentModule(SkSL::Compiler* compiler) {
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
if (!fModuleLoader.fGraphiteFragmentModule) {
const Module* fragmentModule = this->loadFragmentModule(compiler);
fModuleLoader.fGraphiteFragmentModule = compile_and_shrink(compiler,
@@ -402,7 +402,7 @@
}
const Module* ModuleLoader::loadGraphiteVertexModule(SkSL::Compiler* compiler) {
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
if (!fModuleLoader.fGraphiteVertexModule) {
const Module* vertexModule = this->loadVertexModule(compiler);
fModuleLoader.fGraphiteVertexModule = compile_and_shrink(compiler,
diff --git a/src/sksl/SkSLPool.cpp b/src/sksl/SkSLPool.cpp
index 1d7f89a..5ef5d00 100644
--- a/src/sksl/SkSLPool.cpp
+++ b/src/sksl/SkSLPool.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// With GPU support, SkSL::MemoryPool is really GrMemoryPool
#include "src/gpu/ganesh/GrMemoryPool.h"
#endif
diff --git a/src/sksl/SkSLUtil.cpp b/src/sksl/SkSLUtil.cpp
index a90c407..8efeb21 100644
--- a/src/sksl/SkSLUtil.cpp
+++ b/src/sksl/SkSLUtil.cpp
@@ -18,10 +18,10 @@
namespace SkSL {
-// TODO: Once Graphite has its own GPU-caps system, SK_GRAPHITE_ENABLED should get its own mode.
+// TODO: Once Graphite has its own GPU-caps system, SK_GRAPHITE should get its own mode.
// At the moment, it either mimics what GrShaderCaps reports, or it uses these hard-coded values
// depending on the build.
-#if defined(SKSL_STANDALONE) || !defined(SK_GANESH_ENABLED)
+#if defined(SKSL_STANDALONE) || !defined(SK_GANESH)
std::unique_ptr<ShaderCaps> ShaderCapsFactory::MakeShaderCaps() {
std::unique_ptr<ShaderCaps> standalone = std::make_unique<ShaderCaps>();
standalone->fShaderDerivativeSupport = true;
@@ -36,13 +36,13 @@
std::unique_ptr<ShaderCaps> ShaderCapsFactory::MakeShaderCaps() {
return std::make_unique<ShaderCaps>();
}
-#endif // defined(SKSL_STANDALONE) || !defined(SK_GANESH_ENABLED)
+#endif // defined(SKSL_STANDALONE) || !defined(SK_GANESH)
void write_stringstream(const StringStream& s, OutputStream& out) {
out.write(s.str().c_str(), s.str().size());
}
-#if !defined(SKSL_STANDALONE) && (defined(SK_GANESH_ENABLED) || SK_SUPPORT_GRAPHITE)
+#if !defined(SKSL_STANDALONE) && (defined(SK_GANESH) || SK_SUPPORT_GRAPHITE)
bool type_to_sksltype(const Context& context, const Type& type, SkSLType* outType) {
// If a new GrSL type is added, this function will need to be updated.
static_assert(kSkSLTypeCount == 41);
diff --git a/src/sksl/SkSLUtil.h b/src/sksl/SkSLUtil.h
index adf855f..92dfe53 100644
--- a/src/sksl/SkSLUtil.h
+++ b/src/sksl/SkSLUtil.h
@@ -176,7 +176,7 @@
static std::unique_ptr<ShaderCaps> MakeShaderCaps();
};
-#if !defined(SKSL_STANDALONE) && (defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED))
+#if !defined(SKSL_STANDALONE) && (defined(SK_GANESH) || defined(SK_GRAPHITE))
bool type_to_sksltype(const Context& context, const Type& type, SkSLType* outType);
#endif
diff --git a/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp b/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
index 73416d7..20466a9 100644
--- a/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
+++ b/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
@@ -7,7 +7,7 @@
#include "src/sksl/codegen/SkSLPipelineStageCodeGenerator.h"
-#if defined(SKSL_STANDALONE) || defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)
+#if defined(SKSL_STANDALONE) || defined(SK_GANESH) || defined(SK_GRAPHITE)
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
diff --git a/src/sksl/codegen/SkSLPipelineStageCodeGenerator.h b/src/sksl/codegen/SkSLPipelineStageCodeGenerator.h
index b17b00a..7efb0e1 100644
--- a/src/sksl/codegen/SkSLPipelineStageCodeGenerator.h
+++ b/src/sksl/codegen/SkSLPipelineStageCodeGenerator.h
@@ -10,7 +10,7 @@
#include "include/core/SkTypes.h"
-#if defined(SKSL_STANDALONE) || defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)
+#if defined(SKSL_STANDALONE) || defined(SK_GANESH) || defined(SK_GRAPHITE)
#include <string>
diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp
index ea05af5..7059028 100644
--- a/src/svg/SkSVGDevice.cpp
+++ b/src/svg/SkSVGDevice.cpp
@@ -63,7 +63,7 @@
using namespace skia_private;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
class SkMesh;
#endif
class SkBlender;
diff --git a/src/text/gpu/GlyphVector.h b/src/text/gpu/GlyphVector.h
index 2e7ef11..6faafd7 100644
--- a/src/text/gpu/GlyphVector.h
+++ b/src/text/gpu/GlyphVector.h
@@ -17,10 +17,10 @@
#include "src/text/gpu/SubRunAllocator.h"
class SkStrikeClient;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
class GrMeshDrawTarget;
#endif
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
namespace skgpu::graphite { class Recorder; }
#endif
@@ -59,7 +59,7 @@
void packedGlyphIDToGlyph(StrikeCache* cache);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::tuple<bool, int> regenerateAtlas(
int begin, int end,
skgpu::MaskFormat maskFormat,
@@ -67,7 +67,7 @@
GrMeshDrawTarget*);
#endif
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
std::tuple<bool, int> regenerateAtlas(
int begin, int end,
skgpu::MaskFormat maskFormat,
diff --git a/src/text/gpu/SubRunContainer.cpp b/src/text/gpu/SubRunContainer.cpp
index 2647baf..d99bf17 100644
--- a/src/text/gpu/SubRunContainer.cpp
+++ b/src/text/gpu/SubRunContainer.cpp
@@ -28,16 +28,16 @@
#include "src/text/gpu/GlyphVector.h"
#include "src/text/gpu/SubRunAllocator.h"
-#if defined(SK_GANESH_ENABLED) // Ganesh Support
+#if defined(SK_GANESH) // Ganesh Support
#include "src/gpu/ganesh/GrClip.h"
#include "src/gpu/ganesh/GrStyle.h"
#include "src/gpu/ganesh/SkGr.h"
#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/ops/AtlasTextOp.h"
using AtlasTextOp = skgpu::ganesh::AtlasTextOp;
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/Device.h"
#include "src/gpu/graphite/DrawWriter.h"
#include "src/gpu/graphite/Renderer.h"
@@ -75,7 +75,7 @@
kSubRunTypeCount,
};
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
// AtlasSubRun provides a draw() function that grants the anonymous subclasses access to
// Device::drawAtlasSubRun.
void AtlasSubRun::draw(skgpu::graphite::Device* device,
@@ -93,7 +93,7 @@
using namespace sktext;
using namespace sktext::gpu;
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
namespace gr = skgpu::graphite;
using BindBufferInfo = gr::BindBufferInfo;
@@ -172,7 +172,7 @@
return SkMatrix::I();
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
size_t vertexStride(const SkMatrix& matrix) const {
if (fMaskType != MaskFormat::kARGB) {
// For formats MaskFormat::kA565 and MaskFormat::kA8 where A8 include SDF.
@@ -191,9 +191,9 @@
void* vertexBuffer) const;
AtlasTextOp::MaskType opMaskType() const;
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
void fillVertexData(DrawWriter* dw,
int offset, int count,
int ssboIndex,
@@ -218,7 +218,7 @@
uint16_t v;
};
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// Normal text mask, SDFT, or color.
struct Mask2DVertex {
SkPoint devicePos;
@@ -256,7 +256,7 @@
void fill3D(SkZip<Quad, const Glyph*, const VertexData> quadData,
GrColor color,
const SkMatrix& viewDifference) const;
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
const MaskFormat fMaskType;
const SkMatrix fCreationMatrix;
@@ -300,7 +300,7 @@
return fLeftTop.size_bytes();
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void TransformedMaskVertexFiller::fillVertexData(int offset, int count,
SkSpan<const Glyph*> glyphs,
GrColor color,
@@ -390,9 +390,9 @@
}
SkUNREACHABLE;
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
void TransformedMaskVertexFiller::fillVertexData(DrawWriter* dw,
int offset, int count,
int ssboIndex,
@@ -467,7 +467,7 @@
uint16_t v;
};
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// Normal text mask, SDFT, or color.
struct Mask2DVertex {
SkPoint devicePos;
@@ -526,7 +526,7 @@
SkMatrix position_matrix = drawMatrix;
return position_matrix.preTranslate(drawOrigin.x(), drawOrigin.y());
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
// Check for integer translate with the same 2x2 matrix.
// Returns the translation, and true if the change from initial matrix to the position matrix
@@ -780,7 +780,7 @@
accepted, isAntiAliased, strikeToSourceScale, std::move(strikePromise), alloc));
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void draw(SkCanvas* canvas,
const GrClip*,
const SkMatrixProvider&,
@@ -790,8 +790,8 @@
skgpu::v1::SurfaceDrawContext*) const override {
fPathDrawing.submitDraws(canvas, drawOrigin, paint);
}
-#endif // defined(SK_GANESH_ENABLED)
-#if defined(SK_GRAPHITE_ENABLED)
+#endif // defined(SK_GANESH)
+#if defined(SK_GRAPHITE)
void draw(SkCanvas* canvas,
SkPoint drawOrigin,
const SkPaint& paint,
@@ -799,7 +799,7 @@
Device* device) const override {
fPathDrawing.submitDraws(canvas, drawOrigin, paint);
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
int unflattenSize() const override;
@@ -1011,7 +1011,7 @@
SkReadBuffer& buffer,
SubRunAllocator* alloc,
const SkStrikeClient* client);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void draw(SkCanvas* canvas,
const GrClip* clip,
const SkMatrixProvider& viewMatrix,
@@ -1021,8 +1021,8 @@
skgpu::v1::SurfaceDrawContext* sdc) const override {
fDrawingDrawing.submitDraws(canvas, drawOrigin, paint);
}
-#endif // defined(SK_GANESH_ENABLED)
-#if defined(SK_GRAPHITE_ENABLED)
+#endif // defined(SK_GANESH)
+#if defined(SK_GRAPHITE)
void draw(SkCanvas* canvas,
SkPoint drawOrigin,
const SkPaint& paint,
@@ -1030,7 +1030,7 @@
Device* device) const override {
fDrawingDrawing.submitDraws(canvas, drawOrigin, paint);
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
int unflattenSize() const override;
@@ -1071,7 +1071,7 @@
return nullptr;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
enum ClipMethod {
kClippedOut,
kUnclipped,
@@ -1179,7 +1179,7 @@
quad[3] = {{dr, db}, color, {ar, ab}}; // R,B
}
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
// -- DirectMaskSubRun -------------------------------------------------------------------------
class DirectMaskSubRun final : public SubRun, public AtlasSubRun {
@@ -1201,7 +1201,7 @@
SkReadBuffer& buffer,
SubRunAllocator* alloc,
const SkStrikeClient* client);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void draw(SkCanvas*,
const GrClip* clip,
const SkMatrixProvider& viewMatrix,
@@ -1209,9 +1209,9 @@
const SkPaint& paint,
sk_sp<SkRefCnt> subRunOwner,
skgpu::v1::SurfaceDrawContext* sdc) const override;
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void draw(SkCanvas*,
SkPoint drawOrigin,
const SkPaint&,
@@ -1226,7 +1226,7 @@
void testingOnly_packedGlyphIDToGlyph(StrikeCache* cache) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
size_t vertexStride(const SkMatrix& drawMatrix) const override;
std::tuple<const GrClip*, GrOp::Owner>
@@ -1244,9 +1244,9 @@
GrColor color,
const SkMatrix& drawMatrix, SkPoint drawOrigin,
SkIRect clip) const override;
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
std::tuple<bool, int>
regenerateAtlas(int begin, int end, Recorder*) const override;
@@ -1366,7 +1366,7 @@
return SkCount(fGlyphs.glyphs());
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
size_t DirectMaskSubRun::vertexStride(const SkMatrix& positionMatrix) const {
if (!positionMatrix.hasPerspective()) {
if (fMaskFormat != MaskFormat::kARGB) {
@@ -1464,9 +1464,9 @@
std::move(grPaint));
return {clip, std::move(op)};
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void DirectMaskSubRun::draw(SkCanvas*,
SkPoint drawOrigin,
const SkPaint& paint,
@@ -1480,7 +1480,7 @@
fGlyphs.packedGlyphIDToGlyph(cache);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
std::tuple<bool, int> DirectMaskSubRun::regenerateAtlas(int begin, int end,
GrMeshDrawTarget* target) const {
return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, 0, target);
@@ -1595,9 +1595,9 @@
}
}
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
std::tuple<bool, int> DirectMaskSubRun::regenerateAtlas(int begin, int end,
Recorder* recorder) const {
return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, 0, recorder);
@@ -1753,7 +1753,7 @@
MaskFormat maskFormat() const override { return fVertexFiller.grMaskType(); }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void draw(SkCanvas*,
const GrClip* clip,
@@ -1830,9 +1830,9 @@
return fVertexFiller.vertexStride(drawMatrix);
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
void draw(SkCanvas*,
SkPoint drawOrigin,
@@ -1870,7 +1870,7 @@
depth);
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
protected:
SubRunType subRunType() const override { return kTransformMask; }
@@ -1905,7 +1905,7 @@
#if !defined(SK_DISABLE_SDF_TEXT)
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
static std::tuple<AtlasTextOp::MaskType, uint32_t, bool> calculate_sdf_parameters(
const skgpu::v1::SurfaceDrawContext& sdc,
@@ -1936,7 +1936,7 @@
return {maskType, DFGPFlags, useGammaCorrectDistanceTable};
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
class SDFTSubRun final : public SubRun, public AtlasSubRun {
public:
@@ -2013,7 +2013,7 @@
int glyphCount() const override { return fVertexFiller.count(); }
MaskFormat maskFormat() const override { return fVertexFiller.grMaskType(); }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void draw(SkCanvas*,
const GrClip* clip,
const SkMatrixProvider& viewMatrix,
@@ -2101,9 +2101,9 @@
}
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
void draw(SkCanvas*,
SkPoint drawOrigin,
@@ -2140,7 +2140,7 @@
depth);
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
protected:
SubRunType subRunType() const override { return kSDFT; }
@@ -2746,7 +2746,7 @@
return container;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void SubRunContainer::draw(SkCanvas* canvas,
const GrClip* clip,
const SkMatrixProvider& viewMatrix,
@@ -2758,9 +2758,9 @@
subRun.draw(canvas, clip, viewMatrix, drawOrigin, paint, sk_ref_sp(subRunStorage), sdc);
}
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
void SubRunContainer::draw(SkCanvas* canvas,
SkPoint drawOrigin,
const SkPaint& paint,
diff --git a/src/text/gpu/SubRunContainer.h b/src/text/gpu/SubRunContainer.h
index 05dc3f1..5f4379b 100644
--- a/src/text/gpu/SubRunContainer.h
+++ b/src/text/gpu/SubRunContainer.h
@@ -30,7 +30,7 @@
}
}
-#if defined(SK_GANESH_ENABLED) // Ganesh support
+#if defined(SK_GANESH) // Ganesh support
#include "src/gpu/ganesh/GrColor.h"
#include "src/gpu/ganesh/ops/GrOp.h"
@@ -41,7 +41,7 @@
namespace skgpu::v1 { class SurfaceDrawContext; }
#endif
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/geom/Rect.h"
#include "src/gpu/graphite/geom/SubRunData.h"
#include "src/gpu/graphite/geom/Transform_graphite.h"
@@ -80,7 +80,7 @@
virtual int glyphCount() const = 0;
virtual skgpu::MaskFormat maskFormat() const = 0;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
virtual size_t vertexStride(const SkMatrix& drawMatrix) const = 0;
virtual std::tuple<const GrClip*, GrOp::Owner>
@@ -105,7 +105,7 @@
int begin, int end, GrMeshDrawTarget* target) const = 0;
#endif
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
virtual std::tuple<bool, int> regenerateAtlas(
int begin, int end, skgpu::graphite::Recorder*) const = 0;
@@ -126,7 +126,7 @@
virtual void testingOnly_packedGlyphIDToGlyph(StrikeCache* cache) const = 0;
protected:
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
void draw(skgpu::graphite::Device*,
SkPoint drawOrigin,
const SkPaint&,
@@ -142,7 +142,7 @@
class SubRun {
public:
virtual ~SubRun();
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// Produce GPU ops for this subRun or just draw them.
virtual void draw(SkCanvas*,
const GrClip*,
@@ -152,7 +152,7 @@
sk_sp<SkRefCnt> subRunStorage,
skgpu::v1::SurfaceDrawContext*) const = 0;
#endif
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
// Produce uploads and draws for this subRun
virtual void draw(SkCanvas*,
SkPoint drawOrigin,
@@ -264,7 +264,7 @@
static size_t EstimateAllocSize(const GlyphRunList& glyphRunList);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void draw(SkCanvas* canvas,
const GrClip* clip,
const SkMatrixProvider& viewMatrix,
@@ -273,7 +273,7 @@
const SkRefCnt* subRunStorage,
skgpu::v1::SurfaceDrawContext* sdc) const;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void draw(SkCanvas*,
SkPoint drawOrigin,
const SkPaint&,
diff --git a/src/text/gpu/TextBlob.cpp b/src/text/gpu/TextBlob.cpp
index d078054..28a27379 100644
--- a/src/text/gpu/TextBlob.cpp
+++ b/src/text/gpu/TextBlob.cpp
@@ -24,7 +24,7 @@
#include "src/text/gpu/SubRunAllocator.h"
#include "src/text/gpu/SubRunContainer.h"
-#if defined(SK_GANESH_ENABLED) // Ganesh Support
+#if defined(SK_GANESH) // Ganesh Support
#include "src/gpu/ganesh/Device_v1.h"
#include "src/gpu/ganesh/GrClip.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
@@ -102,7 +102,7 @@
const SkStrikeClient* client);
void doFlatten(SkWriteBuffer& buffer) const override;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void surfaceDraw(SkCanvas*,
const GrClip* clip,
const SkMatrixProvider& viewMatrix,
@@ -145,7 +145,7 @@
, fInitialPaint{paint}
, fOrigin{origin} {}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void SlugImpl::surfaceDraw(SkCanvas* canvas, const GrClip* clip, const SkMatrixProvider& viewMatrix,
const SkPaint& drawingPaint, skgpu::v1::SurfaceDrawContext* sdc) const {
fSubRuns->draw(canvas, clip, viewMatrix, fOrigin, drawingPaint, this, sdc);
@@ -379,7 +379,7 @@
const TextBlob::Key& TextBlob::key() const { return fKey; }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void TextBlob::draw(SkCanvas* canvas,
const GrClip* clip,
const SkMatrixProvider& viewMatrix,
@@ -390,7 +390,7 @@
}
#endif
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
void TextBlob::draw(SkCanvas* canvas,
SkPoint drawOrigin,
const SkPaint& paint,
@@ -432,7 +432,7 @@
}
} // namespace sktext::gpu
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
namespace skgpu::v1 {
sk_sp<Slug>
Device::convertGlyphRunListToSlug(const sktext::GlyphRunList& glyphRunList,
diff --git a/src/text/gpu/TextBlob.h b/src/text/gpu/TextBlob.h
index f718a8f..47d72f4 100644
--- a/src/text/gpu/TextBlob.h
+++ b/src/text/gpu/TextBlob.h
@@ -31,7 +31,7 @@
}
}
-#if defined(SK_GANESH_ENABLED) // Ganesh support
+#if defined(SK_GANESH) // Ganesh support
#include "src/gpu/ganesh/GrColor.h"
#include "src/gpu/ganesh/ops/GrOp.h"
class GrAtlasManager;
@@ -119,7 +119,7 @@
const Key& key() const;
size_t size() const { return SkTo<size_t>(fSize); }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void draw(SkCanvas*,
const GrClip* clip,
const SkMatrixProvider& viewMatrix,
@@ -127,7 +127,7 @@
const SkPaint& paint,
skgpu::v1::SurfaceDrawContext* sdc);
#endif
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
void draw(SkCanvas*,
SkPoint drawOrigin,
const SkPaint& paint,
diff --git a/src/text/gpu/TextBlobRedrawCoordinator.cpp b/src/text/gpu/TextBlobRedrawCoordinator.cpp
index 14df3ac..5d184b8 100644
--- a/src/text/gpu/TextBlobRedrawCoordinator.cpp
+++ b/src/text/gpu/TextBlobRedrawCoordinator.cpp
@@ -9,7 +9,7 @@
#include "src/core/SkStrikeCache.h"
#include "src/text/GlyphRun.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/SurfaceDrawContext.h"
#endif
@@ -28,7 +28,7 @@
, fMessageBusID(messageBusID)
, fPurgeBlobInbox(messageBusID) { }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void TextBlobRedrawCoordinator::drawGlyphRunList(SkCanvas* canvas,
const GrClip* clip,
const SkMatrixProvider& viewMatrix,
@@ -43,7 +43,7 @@
}
#endif
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
void TextBlobRedrawCoordinator::drawGlyphRunList(SkCanvas* canvas,
const SkMatrix& viewMatrix,
const sktext::GlyphRunList& glyphRunList,
diff --git a/src/text/gpu/TextBlobRedrawCoordinator.h b/src/text/gpu/TextBlobRedrawCoordinator.h
index ef0e52a..e289152 100644
--- a/src/text/gpu/TextBlobRedrawCoordinator.h
+++ b/src/text/gpu/TextBlobRedrawCoordinator.h
@@ -32,7 +32,7 @@
class TextBlobRedrawCoordinator {
public:
TextBlobRedrawCoordinator(uint32_t messageBusID);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void drawGlyphRunList(SkCanvas* canvas,
const GrClip* clip,
const SkMatrixProvider& viewMatrix,
@@ -41,7 +41,7 @@
SkStrikeDeviceInfo strikeDeviceInfo,
skgpu::v1::SurfaceDrawContext* sdc);
#endif
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
void drawGlyphRunList(SkCanvas* canvas,
const SkMatrix& viewMatrix,
const GlyphRunList& glyphRunList,
diff --git a/src/utils/SkGaussianColorFilter.cpp b/src/utils/SkGaussianColorFilter.cpp
index c1f6a67..1eeeeef 100644
--- a/src/utils/SkGaussianColorFilter.cpp
+++ b/src/utils/SkGaussianColorFilter.cpp
@@ -16,7 +16,7 @@
#include "src/core/SkRasterPipelineOpList.h"
#include "src/core/SkVM.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrFragmentProcessor.h"
// This shouldn't be needed but IWYU needs both (identical) defs of GrFPResult.
#include "src/shaders/SkShaderBase.h"
@@ -33,7 +33,7 @@
class SkReadBuffer;
class SkWriteBuffer;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "src/gpu/graphite/KeyContext.h"
#include "src/gpu/graphite/KeyHelpers.h"
#include "src/gpu/graphite/PaintParamsKey.h"
@@ -56,14 +56,14 @@
return true;
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrFPResult asFragmentProcessor(std::unique_ptr<GrFragmentProcessor> inputFP,
GrRecordingContext*,
const GrColorInfo&,
const SkSurfaceProps&) const override;
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void addToKey(const skgpu::graphite::KeyContext&,
skgpu::graphite::PaintParamsKeyBuilder*,
skgpu::graphite::PipelineDataGatherer*) const override;
@@ -94,7 +94,7 @@
return SkColorFilterPriv::MakeGaussian();
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/effects/SkRuntimeEffect.h"
#include "src/core/SkRuntimeEffectPriv.h"
@@ -117,7 +117,7 @@
}
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
void SkGaussianColorFilter::addToKey(const skgpu::graphite::KeyContext& keyContext,
skgpu::graphite::PaintParamsKeyBuilder* builder,
diff --git a/src/utils/SkNWayCanvas.cpp b/src/utils/SkNWayCanvas.cpp
index 43758fc..2b85fc1 100644
--- a/src/utils/SkNWayCanvas.cpp
+++ b/src/utils/SkNWayCanvas.cpp
@@ -332,7 +332,7 @@
}
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
void SkNWayCanvas::onDrawSlug(const sktext::gpu::Slug* slug) {
Iter iter(fList);
while (iter.next()) {
diff --git a/src/utils/SkShadowTessellator.cpp b/src/utils/SkShadowTessellator.cpp
index 20b038f..095a357 100644
--- a/src/utils/SkShadowTessellator.cpp
+++ b/src/utils/SkShadowTessellator.cpp
@@ -30,7 +30,7 @@
#include <cstdint>
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/geometry/GrPathUtils.h"
#endif
@@ -741,7 +741,7 @@
// tesselation tolerance values, in device space pixels
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
static constexpr SkScalar kQuadTolerance = 0.2f;
static constexpr SkScalar kCubicTolerance = 0.2f;
static constexpr SkScalar kQuadToleranceSqd = kQuadTolerance * kQuadTolerance;
@@ -789,7 +789,7 @@
}
void SkBaseShadowTessellator::handleQuad(const SkPoint pts[3]) {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// check for degeneracy
SkVector v0 = pts[1] - pts[0];
SkVector v1 = pts[2] - pts[0];
@@ -820,7 +820,7 @@
void SkBaseShadowTessellator::handleCubic(const SkMatrix& m, SkPoint pts[4]) {
m.mapPoints(pts, 4);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// TODO: Pull PathUtils out of Ganesh?
int maxCount = GrPathUtils::cubicPointCount(pts, kCubicTolerance);
fPointBuffer.resize(maxCount);
diff --git a/src/utils/SkShadowUtils.cpp b/src/utils/SkShadowUtils.cpp
index a485629..ddd287a 100644
--- a/src/utils/SkShadowUtils.cpp
+++ b/src/utils/SkShadowUtils.cpp
@@ -38,7 +38,7 @@
#include "src/utils/SkShadowTessellator.h"
#endif
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrStyle.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
#endif
@@ -347,14 +347,14 @@
ShadowedPath(const SkPath* path, const SkMatrix* viewMatrix)
: fPath(path)
, fViewMatrix(viewMatrix)
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
, fShapeForKey(*path, GrStyle::SimpleFill())
#endif
{}
const SkPath& path() const { return *fPath; }
const SkMatrix& viewMatrix() const { return *fViewMatrix; }
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
/** Negative means the vertices should not be cached for this path. */
int keyBytes() const { return fShapeForKey.unstyledKeySize() * sizeof(uint32_t); }
void writeKey(void* key) const {
@@ -370,7 +370,7 @@
private:
const SkPath* fPath;
const SkMatrix* fViewMatrix;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrStyledShape fShapeForKey;
#endif
};
diff --git a/tests/BazelTestRunner.cpp b/tests/BazelTestRunner.cpp
index 1153407..7cfd6da 100644
--- a/tests/BazelTestRunner.cpp
+++ b/tests/BazelTestRunner.cpp
@@ -16,7 +16,7 @@
#include "tests/TestHarness.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrContextOptions.h"
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrTypes.h"
@@ -37,7 +37,7 @@
bool fFailed = false;
};
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
namespace skiatest {
bool IsGLContextType(sk_gpu_test::GrContextFactory::ContextType type) {
return GrBackendApi::kOpenGL == sk_gpu_test::GrContextFactory::ContextTypeBackend(type);
@@ -109,7 +109,7 @@
}
} // namespace skiatest
-#endif // #if defined(SK_GANESH_ENABLED)
+#endif // #if defined(SK_GANESH)
TestHarness CurrentTestHarness() {
return TestHarness::kBazelTestRunner;
@@ -125,7 +125,7 @@
}
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrContextOptions grCtxOptions;
// TODO(kjlubick) DM has grContextOptions set via flags. Should this runner have that too?
grCtxOptions.fExecutor = nullptr;
diff --git a/tests/GrAHardwareBufferTest.cpp b/tests/GrAHardwareBufferTest.cpp
index 9f76bd3..288bc5f 100644
--- a/tests/GrAHardwareBufferTest.cpp
+++ b/tests/GrAHardwareBufferTest.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED) && defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26
+#if defined(SK_GANESH) && defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26
#include "include/core/SkCanvas.h"
#include "include/core/SkColorSpace.h"
diff --git a/tests/MultiPictureDocumentTest.cpp b/tests/MultiPictureDocumentTest.cpp
index fc2dbbc..f65ec6d 100644
--- a/tests/MultiPictureDocumentTest.cpp
+++ b/tests/MultiPictureDocumentTest.cpp
@@ -179,7 +179,7 @@
}
-#if defined(SK_GANESH_ENABLED) && defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26
+#if defined(SK_GANESH) && defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26
#include "include/core/SkBitmap.h"
#include "include/core/SkColorSpace.h"
diff --git a/tests/SkRuntimeEffectTest.cpp b/tests/SkRuntimeEffectTest.cpp
index c637929..8554b00 100644
--- a/tests/SkRuntimeEffectTest.cpp
+++ b/tests/SkRuntimeEffectTest.cpp
@@ -66,7 +66,7 @@
struct GrContextOptions;
struct SkIPoint;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/Context.h"
#include "include/gpu/graphite/Recorder.h"
#include "include/gpu/graphite/Recording.h"
@@ -427,7 +427,7 @@
const SkImageInfo info = SkImageInfo::Make(size, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
sk_sp<SkSurface> surface;
if (graphite) {
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
surface = SkSurface::MakeGraphite(graphite->recorder, info);
#endif
} else if (grContext) {
@@ -712,7 +712,7 @@
test_RuntimeEffect_Shaders(r, /*grContext=*/nullptr, /*graphite=*/nullptr);
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
DEF_GRAPHITE_TEST_FOR_RENDERING_CONTEXTS(SkRuntimeEffectSimple_Graphite, r, context) {
std::unique_ptr<skgpu::graphite::Recorder> recorder = context->makeRecorder();
GraphiteInfo graphite = {context, recorder.get()};
diff --git a/tests/SpecialSurfaceTest.cpp b/tests/SpecialSurfaceTest.cpp
index 96c2758..1796968 100644
--- a/tests/SpecialSurfaceTest.cpp
+++ b/tests/SpecialSurfaceTest.cpp
@@ -80,7 +80,7 @@
}
}
-#if SK_GRAPHITE_ENABLED
+#if SK_GRAPHITE
#include "include/gpu/graphite/Context.h"
#include "include/gpu/graphite/TextureInfo.h"
@@ -110,4 +110,4 @@
}
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
diff --git a/tests/Test.h b/tests/Test.h
index 20cc4c4..3bcb66b 100644
--- a/tests/Test.h
+++ b/tests/Test.h
@@ -15,7 +15,7 @@
#include "tests/CtsEnforcement.h"
#include "tools/Registry.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "tools/gpu/GrContextFactory.h" // IWYU pragma: export (because it is used by a macro)
#else
namespace sk_gpu_test { class ContextInfo; }
@@ -174,7 +174,7 @@
using TestRegistry = sk_tools::Registry<Test>;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
using GrContextFactoryContextType = sk_gpu_test::GrContextFactory::ContextType;
#else
using GrContextFactoryContextType = nullptr_t;
diff --git a/tests/TriangulatingPathRendererTests.cpp b/tests/TriangulatingPathRendererTests.cpp
index 3b99efe..5200999 100644
--- a/tests/TriangulatingPathRendererTests.cpp
+++ b/tests/TriangulatingPathRendererTests.cpp
@@ -529,7 +529,7 @@
},
};
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// A simple concave path. Test this with a non-invertible matrix.
static SkPath create_path_17() {
@@ -902,7 +902,7 @@
test_path(ctx, sdc.get(), create_path_47(), SkMatrix(), GrAAType::kCoverage);
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
namespace {
diff --git a/tests/VkDrawableTest.cpp b/tests/VkDrawableTest.cpp
index 4f15d34..af5a3b4 100644
--- a/tests/VkDrawableTest.cpp
+++ b/tests/VkDrawableTest.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED) && defined(SK_VULKAN)
+#if defined(SK_GANESH) && defined(SK_VULKAN)
#include "include/core/SkAlphaType.h"
#include "include/core/SkBitmap.h"
#include "include/core/SkCanvas.h"
diff --git a/tests/VkHardwareBufferTest.cpp b/tests/VkHardwareBufferTest.cpp
index 24505fa..b512244 100644
--- a/tests/VkHardwareBufferTest.cpp
+++ b/tests/VkHardwareBufferTest.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED) && defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26 && defined(SK_VULKAN)
+#if defined(SK_GANESH) && defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26 && defined(SK_VULKAN)
#include "include/core/SkBitmap.h"
#include "include/core/SkCanvas.h"
@@ -1353,6 +1353,6 @@
}
#endif
-#endif // defined(SK_GANESH_ENABLED) && defined(SK_BUILD_FOR_ANDROID) &&
+#endif // defined(SK_GANESH) && defined(SK_BUILD_FOR_ANDROID) &&
// __ANDROID_API__ >= 26 && defined(SK_VULKAN)
diff --git a/tests/VkPriorityExtensionTest.cpp b/tests/VkPriorityExtensionTest.cpp
index 558fae3..0091304 100644
--- a/tests/VkPriorityExtensionTest.cpp
+++ b/tests/VkPriorityExtensionTest.cpp
@@ -7,7 +7,7 @@
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED) && defined(SK_VULKAN)
+#if defined(SK_GANESH) && defined(SK_VULKAN)
#include "include/core/SkTypes.h"
#include "include/gpu/vk/VulkanTypes.h"
diff --git a/tests/VkProtectedContextTest.cpp b/tests/VkProtectedContextTest.cpp
index ba832f8..957f720 100644
--- a/tests/VkProtectedContextTest.cpp
+++ b/tests/VkProtectedContextTest.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED) && defined(SK_VULKAN)
+#if defined(SK_GANESH) && defined(SK_VULKAN)
#include "include/core/SkAlphaType.h"
#include "include/core/SkBlendMode.h"
@@ -360,4 +360,4 @@
canvas->drawImage(image, 0, 0);
}
-#endif // defined(SK_GANESH_ENABLED) && defined(SK_VULKAN)
+#endif // defined(SK_GANESH) && defined(SK_VULKAN)
diff --git a/tests/VkYcbcrSamplerTest.cpp b/tests/VkYcbcrSamplerTest.cpp
index 85e1bad..ff4d53e 100644
--- a/tests/VkYcbcrSamplerTest.cpp
+++ b/tests/VkYcbcrSamplerTest.cpp
@@ -7,7 +7,7 @@
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED) && defined(SK_VULKAN)
+#if defined(SK_GANESH) && defined(SK_VULKAN)
#include "include/core/SkAlphaType.h"
#include "include/core/SkCanvas.h"
#include "include/core/SkColorSpace.h"
@@ -161,4 +161,4 @@
}
}
-#endif // defined(SK_GANESH_ENABLED) && defined(SK_VULKAN)
+#endif // defined(SK_GANESH) && defined(SK_VULKAN)
diff --git a/tests/WrappedSurfaceCopyOnWriteTest.cpp b/tests/WrappedSurfaceCopyOnWriteTest.cpp
index 0c677a8..1525537 100644
--- a/tests/WrappedSurfaceCopyOnWriteTest.cpp
+++ b/tests/WrappedSurfaceCopyOnWriteTest.cpp
@@ -162,7 +162,7 @@
CheckSolidPixels(SkColor4f{1, 0, 0, 1}, pixels, kTol, errorReporter);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// Make sure OpsTask are skippable
DEF_GANESH_TEST_FOR_RENDERING_CONTEXTS(SkipOpsTaskTest, reporter, ctxInfo, CtsEnforcement::kNever) {
@@ -196,4 +196,4 @@
});
CheckSolidPixels(SkColor4f{1, 0, 0, 1}, pixels, kTol, errorReporter);
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp
index 613d5f1..c849724 100644
--- a/tests/WritePixelsTest.cpp
+++ b/tests/WritePixelsTest.cpp
@@ -23,7 +23,7 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrTypes.h"
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/Context.h"
#endif
#include "include/private/SkColorData.h"
@@ -489,7 +489,7 @@
test_write_pixels(reporter, ctxInfo.directContext(), 1);
}
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
static void test_write_pixels(skiatest::Reporter* reporter,
skgpu::graphite::Recorder* recorder,
int sampleCnt) {
diff --git a/tests/graphite/CombinationBuilderTest.cpp b/tests/graphite/CombinationBuilderTest.cpp
index d8c4c7e..a8174b6 100644
--- a/tests/graphite/CombinationBuilderTest.cpp
+++ b/tests/graphite/CombinationBuilderTest.cpp
@@ -7,7 +7,7 @@
#include "tests/Test.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/core/SkColorSpace.h"
#include "include/effects/SkRuntimeEffect.h"
@@ -294,4 +294,4 @@
runtime_effect_test(keyContext, reporter);
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
diff --git a/tests/graphite/MutableImagesTest.cpp b/tests/graphite/MutableImagesTest.cpp
index 3ab8112..92c8b1b 100644
--- a/tests/graphite/MutableImagesTest.cpp
+++ b/tests/graphite/MutableImagesTest.cpp
@@ -7,7 +7,7 @@
#include "tests/Test.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/core/SkImage.h"
#include "include/gpu/GpuTypes.h"
@@ -520,4 +520,4 @@
}
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
diff --git a/tests/graphite/PaintParamsKeyTest.cpp b/tests/graphite/PaintParamsKeyTest.cpp
index ec8e2eb..d1f7960 100644
--- a/tests/graphite/PaintParamsKeyTest.cpp
+++ b/tests/graphite/PaintParamsKeyTest.cpp
@@ -7,7 +7,7 @@
#include "tests/Test.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/core/SkBitmap.h"
#include "include/core/SkCanvas.h"
@@ -755,4 +755,4 @@
}
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
diff --git a/toolchain/linux_trampolines/IWYU_mapping.imp b/toolchain/linux_trampolines/IWYU_mapping.imp
index 2855beb..d21fd12 100644
--- a/toolchain/linux_trampolines/IWYU_mapping.imp
+++ b/toolchain/linux_trampolines/IWYU_mapping.imp
@@ -408,10 +408,9 @@
{ symbol: ["SK_DEBUG", "private", "\"include/private/base/SkDebug.h\"", "public"] },
{ symbol: ["SK_DEBUG", "private", "\"include/private/base/SkLoadUserConfig.h\"", "public"] },
- # Pretend SK_GANESH_ENABLED is defined in any of these
- { symbol: ["SK_DEBUG", "private", "\"include/private/base/SkLoadUserConfig.h\"", "public"] },
- { symbol: ["SK_DEBUG", "private", "\"include/core/SkTypes.h\"", "public"] },
-
+ # Pretend SK_GANESH is defined in any of these
+ { symbol: ["SK_GANESH", "private", "\"include/private/base/SkLoadUserConfig.h\"", "public"] },
+ { symbol: ["SK_GANESH", "private", "\"include/core/SkTypes.h\"", "public"] },
{ symbol: ["SkScalar", "private", "\"include/core/SkScalar.h\"", "public"] },
diff --git a/tools/ToolUtils.cpp b/tools/ToolUtils.cpp
index 3f5b462..a64c33d 100644
--- a/tools/ToolUtils.cpp
+++ b/tools/ToolUtils.cpp
@@ -31,7 +31,7 @@
#include <cmath>
#include <cstring>
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/ImageProvider.h"
#include <unordered_map>
#endif
@@ -42,7 +42,7 @@
#include "src/xml/SkDOM.h"
#endif
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/ganesh/GrCaps.h"
@@ -566,7 +566,7 @@
}
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
sk_sp<SkImage> MakeTextureImage(SkCanvas* canvas, sk_sp<SkImage> orig) {
if (!orig) {
return nullptr;
@@ -585,7 +585,7 @@
return orig->makeTextureImage(dContext);
}
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
else if (canvas->recorder()) {
return orig->makeTextureImage(canvas->recorder());
}
@@ -678,7 +678,7 @@
fAxisSliders.size()};
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
// Currently, we give each new Recorder its own ImageProvider. This means we don't have to deal
// w/ any threading issues.
@@ -735,6 +735,6 @@
return options;
}
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
} // namespace ToolUtils
diff --git a/tools/ToolUtils.h b/tools/ToolUtils.h
index e15c072..fcbdd75 100644
--- a/tools/ToolUtils.h
+++ b/tools/ToolUtils.h
@@ -31,7 +31,7 @@
#include "src/base/SkTInternalLList.h"
#include "tools/SkMetaData.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/Recorder.h"
#endif
@@ -317,7 +317,7 @@
// Supported file formats are .svg and .skp.
void sniff_paths(const char filepath[], std::function<PathSniffCallback>);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
sk_sp<SkImage> MakeTextureImage(SkCanvas* canvas, sk_sp<SkImage> orig);
#endif
@@ -353,7 +353,7 @@
static constexpr size_t kAxisVarsSize = 3;
};
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
skgpu::graphite::RecorderOptions CreateTestingRecorderOptions();
#endif
diff --git a/tools/debugger/DebugCanvas.cpp b/tools/debugger/DebugCanvas.cpp
index 3ed4c11..d9d9228 100644
--- a/tools/debugger/DebugCanvas.cpp
+++ b/tools/debugger/DebugCanvas.cpp
@@ -44,7 +44,7 @@
class UrlDataManager;
struct SkDrawShadowRec;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/GrAuditTrail.h"
#endif
@@ -163,7 +163,7 @@
DebugPaintFilterCanvas filterCanvas(originalCanvas);
SkCanvas* finalCanvas = fOverdrawViz ? &filterCanvas : originalCanvas;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
auto dContext = GrAsDirectContext(finalCanvas->recordingContext());
// If we have a GPU backend we can also visualize the op information
@@ -175,7 +175,7 @@
#endif
for (int i = 0; i <= index; i++) {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrAuditTrail::AutoCollectOps* acb = nullptr;
if (at) {
// We need to flush any pending operations, or they might combine with commands below.
@@ -190,7 +190,7 @@
if (fCommandVector[i]->isVisible()) {
fCommandVector[i]->execute(finalCanvas);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (at && acb) {
delete acb;
}
@@ -224,7 +224,7 @@
finalCanvas->drawRect(fAndroidClip, androidClipPaint);
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
// draw any ops if required and issue a full reset onto GrAuditTrail
if (at) {
// just in case there is global reordering, we flush the canvas before querying
@@ -292,7 +292,7 @@
return fCommandVector[index];
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrAuditTrail* DebugCanvas::getAuditTrail(SkCanvas* canvas) {
GrAuditTrail* at = nullptr;
auto ctx = canvas->recordingContext();
@@ -330,12 +330,12 @@
at->fullReset();
}
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
void DebugCanvas::toJSON(SkJSONWriter& writer,
UrlDataManager& urlDataManager,
SkCanvas* canvas) {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
this->drawAndCollectOps(canvas);
// now collect json
@@ -348,7 +348,7 @@
writer.beginObject(); // command
this->getDrawCommandAt(i)->toJSON(writer, urlDataManager);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (at) {
writer.appendName(SKDEBUGCANVAS_ATTRIBUTE_AUDITTRAIL);
at->toJson(writer, i);
@@ -358,13 +358,13 @@
}
writer.endArray(); // commands
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
this->cleanupAuditTrail(at);
#endif
}
void DebugCanvas::toJSONOpsTask(SkJSONWriter& writer, SkCanvas* canvas) {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
this->drawAndCollectOps(canvas);
GrAuditTrail* at = this->getAuditTrail(canvas);
diff --git a/tools/debugger/DebugCanvas.h b/tools/debugger/DebugCanvas.h
index 3b2edeb..d3a22b7 100644
--- a/tools/debugger/DebugCanvas.h
+++ b/tools/debugger/DebugCanvas.h
@@ -251,7 +251,7 @@
*/
void addDrawCommand(DrawCommand* command);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrAuditTrail* getAuditTrail(SkCanvas*);
void drawAndCollectOps(SkCanvas*);
void cleanupAuditTrail(GrAuditTrail*);
diff --git a/tools/debugger/DrawCommand.cpp b/tools/debugger/DrawCommand.cpp
index 4ea2422..202f9b9 100644
--- a/tools/debugger/DrawCommand.cpp
+++ b/tools/debugger/DrawCommand.cpp
@@ -56,7 +56,7 @@
class GrDirectContext;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrRecordingContext.h"
#endif
@@ -674,7 +674,7 @@
SkImageInfo::Make(image.dimensions(), kN32_SkColorType, kPremul_SkAlphaType);
// "cheat" for this debug tool and use image's context
GrDirectContext* dContext = nullptr;
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
dContext = GrAsDirectContext(as_IB(&image)->context());
#endif
if (!image.readPixels(dContext, dstInfo, buffer.get(), rowBytes, 0, 0)) {
diff --git a/tools/flags/CommonFlagsConfig.cpp b/tools/flags/CommonFlagsConfig.cpp
index 923ba6e..4f45dd5 100644
--- a/tools/flags/CommonFlagsConfig.cpp
+++ b/tools/flags/CommonFlagsConfig.cpp
@@ -133,7 +133,7 @@
{ "d3dmsaa8", "gpu", "api=direct3d,samples=8" },
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#ifdef SK_DIRECT3D
{ "grd3d", "graphite", "api=direct3d" },
#endif
@@ -470,7 +470,7 @@
return parse_option_gpu_api(*optionValue, outContextType, outFakeGLESVersion2);
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
bool get_option_graphite_api(const char* optionKey,
SkCommandLineConfigGraphite::ContextType* outContextType) const {
SkString* optionValue = fOptionsMap.find(SkString(optionKey));
@@ -659,7 +659,7 @@
surfType);
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
SkCommandLineConfigGraphite* parse_command_line_config_graphite(const SkString& tag,
const SkTArray<SkString>& vias,
@@ -764,7 +764,7 @@
if (extendedBackend.equals("gpu")) {
parsedConfig = parse_command_line_config_gpu(tag, vias, extendedOptions);
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (extendedBackend.equals("graphite")) {
parsedConfig = parse_command_line_config_graphite(tag, vias, extendedOptions);
}
diff --git a/tools/flags/CommonFlagsConfig.h b/tools/flags/CommonFlagsConfig.h
index 0348e3c..bbea306 100644
--- a/tools/flags/CommonFlagsConfig.h
+++ b/tools/flags/CommonFlagsConfig.h
@@ -110,7 +110,7 @@
SurfType fSurfType;
};
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "tools/graphite/ContextFactory.h"
@@ -140,7 +140,7 @@
SkAlphaType fAlphaType;
};
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
// SkCommandLineConfigSvg is a SkCommandLineConfig that extracts information out of the backend
// part of the tag. It is constructed tags that have:
diff --git a/tools/gpu/FlushFinishTracker.cpp b/tools/gpu/FlushFinishTracker.cpp
index 352c346..537295b 100644
--- a/tools/gpu/FlushFinishTracker.cpp
+++ b/tools/gpu/FlushFinishTracker.cpp
@@ -10,7 +10,7 @@
#include "include/gpu/GrDirectContext.h"
#include "src/core/SkTraceEvent.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/Context.h"
#endif
@@ -26,7 +26,7 @@
if (fContext) {
fContext->checkAsyncWorkCompletion();
} else {
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
SkASSERT(fGraphiteContext);
fGraphiteContext->checkAsyncWorkCompletion();
#else
diff --git a/tools/gpu/FlushFinishTracker.h b/tools/gpu/FlushFinishTracker.h
index 1536d1c..66465f0 100644
--- a/tools/gpu/FlushFinishTracker.h
+++ b/tools/gpu/FlushFinishTracker.h
@@ -13,7 +13,7 @@
class GrDirectContext;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
namespace skgpu::graphite { class Context; }
#endif
@@ -32,7 +32,7 @@
}
FlushFinishTracker(GrDirectContext* context) : fContext(context) {}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
FlushFinishTracker(skgpu::graphite::Context* context) : fGraphiteContext(context) {}
#endif
@@ -42,7 +42,7 @@
private:
GrDirectContext* fContext = nullptr;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
skgpu::graphite::Context* fGraphiteContext = nullptr;
#endif
diff --git a/tools/gpu/ProxyUtils.cpp b/tools/gpu/ProxyUtils.cpp
index e089754..baf5efd 100644
--- a/tools/gpu/ProxyUtils.cpp
+++ b/tools/gpu/ProxyUtils.cpp
@@ -22,7 +22,7 @@
#include "src/gpu/ganesh/SurfaceContext.h"
#include "src/image/SkImage_Base.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h"
#endif
@@ -92,7 +92,7 @@
return sContext->readSurfaceView();
}
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrProgramInfo* CreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
@@ -123,6 +123,6 @@
primitiveType, renderPassXferBarriers,
colorLoadOp, flags, stencilSettings);
}
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
} // namespace sk_gpu_test
diff --git a/tools/gpu/ProxyUtils.h b/tools/gpu/ProxyUtils.h
index c5f5814..f0e1319 100644
--- a/tools/gpu/ProxyUtils.h
+++ b/tools/gpu/ProxyUtils.h
@@ -28,7 +28,7 @@
GrSurfaceOrigin,
GrCPixmap pixmap);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
GrProgramInfo* CreateProgramInfo(const GrCaps*,
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
diff --git a/tools/sk_app/Window.h b/tools/sk_app/Window.h
index 79c5345..2d2bbbd 100644
--- a/tools/sk_app/Window.h
+++ b/tools/sk_app/Window.h
@@ -64,7 +64,7 @@
#endif
#ifdef SK_DAWN
kDawn_BackendType,
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
kGraphiteDawn_BackendType,
#endif
#endif
@@ -73,7 +73,7 @@
#endif
#ifdef SK_METAL
kMetal_BackendType,
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
kGraphiteMetal_BackendType,
#endif
#endif
diff --git a/tools/sk_app/WindowContext.cpp b/tools/sk_app/WindowContext.cpp
index 7ec4f8d..bd2cbe2 100644
--- a/tools/sk_app/WindowContext.cpp
+++ b/tools/sk_app/WindowContext.cpp
@@ -8,7 +8,7 @@
#include "tools/sk_app/WindowContext.h"
#include "include/gpu/GrDirectContext.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/Context.h"
#include "include/gpu/graphite/Recorder.h"
#endif
diff --git a/tools/sk_app/WindowContext.h b/tools/sk_app/WindowContext.h
index e218fec..20e2dc3 100644
--- a/tools/sk_app/WindowContext.h
+++ b/tools/sk_app/WindowContext.h
@@ -14,7 +14,7 @@
class GrDirectContext;
class SkSurface;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
namespace skgpu::graphite {
class Context;
class Recorder;
@@ -43,7 +43,7 @@
virtual void setDisplayParams(const DisplayParams& params) = 0;
GrDirectContext* directContext() const { return fContext.get(); }
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
skgpu::graphite::Context* graphiteContext() const { return fGraphiteContext.get(); }
skgpu::graphite::Recorder* graphiteRecorder() const { return fGraphiteRecorder.get(); }
#endif
@@ -58,7 +58,7 @@
virtual bool isGpuContext() { return true; }
sk_sp<GrDirectContext> fContext;
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
std::unique_ptr<skgpu::graphite::Context> fGraphiteContext;
std::unique_ptr<skgpu::graphite::Recorder> fGraphiteRecorder;
#endif
diff --git a/tools/sk_app/mac/WindowContextFactory_mac.h b/tools/sk_app/mac/WindowContextFactory_mac.h
index 48e9422..7ce5aac 100644
--- a/tools/sk_app/mac/WindowContextFactory_mac.h
+++ b/tools/sk_app/mac/WindowContextFactory_mac.h
@@ -49,14 +49,14 @@
#ifdef SK_DAWN
std::unique_ptr<WindowContext> MakeDawnMTLForMac(const MacWindowInfo&, const DisplayParams&);
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
std::unique_ptr<WindowContext> MakeGraphiteDawnMetalForMac(const MacWindowInfo&, const DisplayParams&);
#endif
#endif
#ifdef SK_METAL
std::unique_ptr<WindowContext> MakeMetalForMac(const MacWindowInfo&, const DisplayParams&);
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
std::unique_ptr<WindowContext> MakeGraphiteMetalForMac(const MacWindowInfo&, const DisplayParams&);
#endif
#endif
diff --git a/tools/sk_app/mac/Window_mac.mm b/tools/sk_app/mac/Window_mac.mm
index 69668fb..53b209b 100644
--- a/tools/sk_app/mac/Window_mac.mm
+++ b/tools/sk_app/mac/Window_mac.mm
@@ -126,7 +126,7 @@
case kDawn_BackendType:
fWindowContext = MakeDawnMTLForMac(info, fRequestedDisplayParams);
break;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
case kGraphiteDawn_BackendType:
fWindowContext = MakeGraphiteDawnMetalForMac(info, fRequestedDisplayParams);
break;
@@ -141,7 +141,7 @@
case kMetal_BackendType:
fWindowContext = MakeMetalForMac(info, fRequestedDisplayParams);
break;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
case kGraphiteMetal_BackendType:
fWindowContext = MakeGraphiteMetalForMac(info, fRequestedDisplayParams);
break;
diff --git a/tools/sk_app/unix/WindowContextFactory_unix.h b/tools/sk_app/unix/WindowContextFactory_unix.h
index 9e8d254..1a340a2 100644
--- a/tools/sk_app/unix/WindowContextFactory_unix.h
+++ b/tools/sk_app/unix/WindowContextFactory_unix.h
@@ -44,7 +44,7 @@
std::unique_ptr<WindowContext> MakeDawnVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
#endif
-#if defined(SK_DAWN) && defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_DAWN) && defined(SK_GRAPHITE)
std::unique_ptr<WindowContext> MakeGraphiteDawnVulkanForXlib(const XlibWindowInfo&,
const DisplayParams&);
#endif
diff --git a/tools/sk_app/unix/Window_unix.cpp b/tools/sk_app/unix/Window_unix.cpp
index d93a138..be4f121 100644
--- a/tools/sk_app/unix/Window_unix.cpp
+++ b/tools/sk_app/unix/Window_unix.cpp
@@ -401,7 +401,7 @@
window_context_factory::MakeDawnVulkanForXlib(winInfo, fRequestedDisplayParams);
break;
#endif
-#if defined(SK_DAWN) && defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_DAWN) && defined(SK_GRAPHITE)
case kGraphiteDawn_BackendType:
fWindowContext =
window_context_factory::MakeGraphiteDawnVulkanForXlib(winInfo,
diff --git a/tools/sk_app/win/WindowContextFactory_win.h b/tools/sk_app/win/WindowContextFactory_win.h
index 9493bb1..591b425 100644
--- a/tools/sk_app/win/WindowContextFactory_win.h
+++ b/tools/sk_app/win/WindowContextFactory_win.h
@@ -32,7 +32,7 @@
#ifdef SK_DAWN
std::unique_ptr<WindowContext> MakeDawnD3D12ForWin(HWND, const DisplayParams&);
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
std::unique_ptr<WindowContext> MakeGraphiteDawnD3D12ForWin(HWND, const DisplayParams&);
#endif
#endif
diff --git a/tools/sk_app/win/Window_win.cpp b/tools/sk_app/win/Window_win.cpp
index cf5dfa1..00585e3 100644
--- a/tools/sk_app/win/Window_win.cpp
+++ b/tools/sk_app/win/Window_win.cpp
@@ -364,7 +364,7 @@
fWindowContext =
window_context_factory::MakeDawnD3D12ForWin(fHWnd, fRequestedDisplayParams);
break;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
case kGraphiteDawn_BackendType:
fWindowContext = window_context_factory::MakeGraphiteDawnD3D12ForWin(
fHWnd, fRequestedDisplayParams);
diff --git a/tools/skottie_ios_app/GrContextHolder.mm b/tools/skottie_ios_app/GrContextHolder.mm
index 0fa8e1c..11a53ce 100644
--- a/tools/skottie_ios_app/GrContextHolder.mm
+++ b/tools/skottie_ios_app/GrContextHolder.mm
@@ -5,7 +5,7 @@
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrContextOptions.h"
#include "include/gpu/GrDirectContext.h"
diff --git a/tools/skottie_ios_app/main.mm b/tools/skottie_ios_app/main.mm
index f951620..bd216ed 100644
--- a/tools/skottie_ios_app/main.mm
+++ b/tools/skottie_ios_app/main.mm
@@ -24,9 +24,9 @@
- (void)viewDidLoad {
[super viewDidLoad];
if (![self skiaContext]) {
- #if (defined(SK_GANESH_ENABLED) && defined(SK_METAL) && !defined(SK_BUILD_FOR_GOOGLE3))
+ #if (defined(SK_GANESH) && defined(SK_METAL) && !defined(SK_BUILD_FOR_GOOGLE3))
[self setSkiaContext:MakeSkiaMetalContext()];
- #elif (defined(SK_GANESH_ENABLED) && defined(SK_GL) && !defined(SK_BUILD_FOR_GOOGLE3))
+ #elif (defined(SK_GANESH) && defined(SK_GL) && !defined(SK_BUILD_FOR_GOOGLE3))
[self setSkiaContext:MakeSkiaGLContext()];
#else
[self setSkiaContext:MakeSkiaUIContext()];
diff --git a/tools/skqp/src/skqp_GpuTestProcs.cpp b/tools/skqp/src/skqp_GpuTestProcs.cpp
index 0c55f80..cc48916 100644
--- a/tools/skqp/src/skqp_GpuTestProcs.cpp
+++ b/tools/skqp/src/skqp_GpuTestProcs.cpp
@@ -15,7 +15,7 @@
#include "tools/gpu/vk/VkTestContext.h"
#include <mutex>
#endif
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/Context.h"
#include "tools/graphite/ContextFactory.h"
#endif
@@ -122,7 +122,7 @@
}
}
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
namespace graphite {
@@ -132,7 +132,7 @@
} // namespace graphite
-#endif // SK_GRAPHITE_ENABLED
+#endif // SK_GRAPHITE
} // namespace skiatest
diff --git a/tools/viewer/AnimatedTextSlide.cpp b/tools/viewer/AnimatedTextSlide.cpp
index 1e5449c..24cb183 100644
--- a/tools/viewer/AnimatedTextSlide.cpp
+++ b/tools/viewer/AnimatedTextSlide.cpp
@@ -16,7 +16,7 @@
#include "src/base/SkUTF.h"
#include "tools/viewer/Slide.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrDirectContext.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
@@ -69,7 +69,7 @@
canvas->save();
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
auto direct = GrAsDirectContext(canvas->recordingContext());
if (direct) {
SkSamplingOptions sampling(SkFilterMode::kLinear, SkMipmapMode::kNearest);
diff --git a/tools/viewer/ChineseFlingSlide.cpp b/tools/viewer/ChineseFlingSlide.cpp
index 2ad5336..96c6de5 100644
--- a/tools/viewer/ChineseFlingSlide.cpp
+++ b/tools/viewer/ChineseFlingSlide.cpp
@@ -15,7 +15,7 @@
#include "tools/ToolUtils.h"
#include "tools/viewer/Slide.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/gpu/GrDirectContext.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
@@ -139,7 +139,7 @@
paint.setColor(0xDE000000);
if (fAfterFirstFrame) {
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
auto direct = GrAsDirectContext(canvas->recordingContext());
if (direct) {
sk_sp<SkImage> image = direct->priv().testingOnly_getFontAtlasImage(MaskFormat::kA8,
diff --git a/tools/viewer/PathTessellatorsSlide.cpp b/tools/viewer/PathTessellatorsSlide.cpp
index 1bddb4d..0ae525e 100644
--- a/tools/viewer/PathTessellatorsSlide.cpp
+++ b/tools/viewer/PathTessellatorsSlide.cpp
@@ -9,7 +9,7 @@
#include "src/core/SkPathPriv.h"
#include "tools/viewer/ClickHandlerSlide.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/core/SkCanvasPriv.h"
#include "src/gpu/ganesh/GrCaps.h"
@@ -330,4 +330,4 @@
} // namespace skgpu::v1
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
diff --git a/tools/viewer/RectanizerSlide.cpp b/tools/viewer/RectanizerSlide.cpp
index ff79f53..bc93a74 100644
--- a/tools/viewer/RectanizerSlide.cpp
+++ b/tools/viewer/RectanizerSlide.cpp
@@ -11,7 +11,7 @@
#include "src/base/SkRandom.h"
#include "src/base/SkUTF.h"
#include "tools/viewer/Slide.h"
-#if defined(SK_GANESH_ENABLED) || defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GANESH) || defined(SK_GRAPHITE)
#include "src/gpu/RectanizerPow2.h"
#include "src/gpu/RectanizerSkyline.h"
diff --git a/tools/viewer/StrokeVerbSlide.cpp b/tools/viewer/StrokeVerbSlide.cpp
index 3266c38..f6d6f9c 100644
--- a/tools/viewer/StrokeVerbSlide.cpp
+++ b/tools/viewer/StrokeVerbSlide.cpp
@@ -7,7 +7,7 @@
#include "include/core/SkTypes.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "include/core/SkCanvas.h"
#include "include/core/SkFont.h"
@@ -229,4 +229,4 @@
DEF_SLIDE(return new StrokeVerbSlide;)
-#endif // defined(SK_GANESH_ENABLED)
+#endif // defined(SK_GANESH)
diff --git a/tools/viewer/TextureUploadSlide.cpp b/tools/viewer/TextureUploadSlide.cpp
index c6926bc..cdc595b 100644
--- a/tools/viewer/TextureUploadSlide.cpp
+++ b/tools/viewer/TextureUploadSlide.cpp
@@ -42,7 +42,7 @@
void draw(SkCanvas* canvas) override {
canvas->clear(0xFFFFFFFF);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
auto direct = GrAsDirectContext(canvas->recordingContext());
if (direct) {
// One-time context-specific setup.
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 2aae656..779e295 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -55,7 +55,7 @@
#include "tools/viewer/SlideDir.h"
#include "tools/viewer/SvgSlide.h"
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
#include "src/gpu/ganesh/ops/AtlasPathRenderer.h"
#include "src/gpu/ganesh/ops/TessellationPathRenderer.h"
#endif
@@ -201,7 +201,7 @@
#endif
#ifdef SK_DAWN
case sk_app::Window::kDawn_BackendType: return "Dawn";
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
case sk_app::Window::kGraphiteDawn_BackendType: return "Dawn (Graphite)";
#endif
#endif
@@ -210,7 +210,7 @@
#endif
#ifdef SK_METAL
case sk_app::Window::kMetal_BackendType: return "Metal";
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
case sk_app::Window::kGraphiteMetal_BackendType: return "Metal (Graphite)";
#endif
#endif
@@ -228,7 +228,7 @@
if (0 == strcmp(str, "dawn")) {
return sk_app::Window::kDawn_BackendType;
} else
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (0 == strcmp(str, "grdawn")) {
return sk_app::Window::kGraphiteDawn_BackendType;
} else
@@ -248,7 +248,7 @@
if (0 == strcmp(str, "mtl")) {
return sk_app::Window::kMetal_BackendType;
} else
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
if (0 == strcmp(str, "grmtl")) {
return sk_app::Window::kGraphiteMetal_BackendType;
} else
@@ -1952,7 +1952,7 @@
#if defined(SK_METAL)
ImGui::SameLine();
ImGui::RadioButton("Metal", &newBackend, sk_app::Window::kMetal_BackendType);
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
ImGui::SameLine();
ImGui::RadioButton("Metal (Graphite)", &newBackend,
sk_app::Window::kGraphiteMetal_BackendType);
@@ -2055,7 +2055,7 @@
ImGui::RadioButton("Software", true);
} else {
prButton(GpuPathRenderers::kDefault);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (fWindow->sampleCount() > 1 || FLAGS_dmsaa) {
const auto* caps = ctx->priv().caps();
if (skgpu::v1::AtlasPathRenderer::IsSupported(ctx)) {
@@ -3015,7 +3015,7 @@
writer.appendNString("Software");
} else {
writer.appendString(gPathRendererNames[GpuPathRenderers::kDefault]);
-#if defined(SK_GANESH_ENABLED)
+#if defined(SK_GANESH)
if (fWindow->sampleCount() > 1 || FLAGS_dmsaa) {
const auto* caps = ctx->priv().caps();
if (skgpu::v1::AtlasPathRenderer::IsSupported(ctx)) {
diff --git a/tools/window/SkWindowContext.cpp b/tools/window/SkWindowContext.cpp
index 85cc92f..1de1ab5 100644
--- a/tools/window/SkWindowContext.cpp
+++ b/tools/window/SkWindowContext.cpp
@@ -8,7 +8,7 @@
#include "tools/window/SkWindowContext.h"
#include "include/gpu/GrDirectContext.h"
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
#include "include/gpu/graphite/Context.h"
#include "include/gpu/graphite/Recorder.h"
#endif
diff --git a/tools/window/SkWindowContext.h b/tools/window/SkWindowContext.h
index 837d188..592ace1 100644
--- a/tools/window/SkWindowContext.h
+++ b/tools/window/SkWindowContext.h
@@ -14,7 +14,7 @@
class GrDirectContext;
class SkSurface;
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
namespace skgpu::graphite {
class Context;
class Recorder;
@@ -41,7 +41,7 @@
virtual void setDisplayParams(const SkDisplayParams& params) = 0;
GrDirectContext* directContext() const { return fContext.get(); }
-#ifdef SK_GRAPHITE_ENABLED
+#if defined(SK_GRAPHITE)
skgpu::graphite::Context* graphiteContext() const { return fGraphiteContext.get(); }
skgpu::graphite::Recorder* graphiteRecorder() const { return fGraphiteRecorder.get(); }
#endif
@@ -56,7 +56,7 @@
virtual bool isGpuContext() { return true; }
sk_sp<GrDirectContext> fContext;
-#if defined(SK_GRAPHITE_ENABLED)
+#if defined(SK_GRAPHITE)
std::unique_ptr<skgpu::graphite::Context> fGraphiteContext;
std::unique_ptr<skgpu::graphite::Recorder> fGraphiteRecorder;
#endif
