Move the contents of src/gpu/ganesh/v1 up a level
Additionally: rename SurfaceDrawContext_v1.h -> SurfaceDrawContext.h
Change-Id: I8471b709b28268d3b2fa108026df95e861f78e02
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/566884
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
diff --git a/bench/BulkRectBench.cpp b/bench/BulkRectBench.cpp
index 3a8dffc..425f7f0 100644
--- a/bench/BulkRectBench.cpp
+++ b/bench/BulkRectBench.cpp
@@ -15,7 +15,7 @@
#include "src/core/SkCanvasPriv.h"
#include "src/gpu/ganesh/GrOpsTypes.h"
#include "src/gpu/ganesh/SkGr.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
// Benchmarks that exercise the bulk image and solid color quad APIs, under a variety of patterns:
enum class ImageMode {
diff --git a/bench/ClearBench.cpp b/bench/ClearBench.cpp
index 37c5aa3..2a2f4a4 100644
--- a/bench/ClearBench.cpp
+++ b/bench/ClearBench.cpp
@@ -18,7 +18,7 @@
#include "include/core/SkRect.h"
#include "include/effects/SkGradientShader.h"
#include "src/core/SkCanvasPriv.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
static sk_sp<SkShader> make_shader() {
static const SkPoint kPts[] = {{0, 0}, {10, 10}};
diff --git a/bench/VertexColorSpaceBench.cpp b/bench/VertexColorSpaceBench.cpp
index abe1ce4..4af6340 100644
--- a/bench/VertexColorSpaceBench.cpp
+++ b/bench/VertexColorSpaceBench.cpp
@@ -17,13 +17,13 @@
#include "src/gpu/ganesh/GrMemoryPool.h"
#include "src/gpu/ganesh/GrProgramInfo.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLVarying.h"
#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h"
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
namespace {
diff --git a/gm/aarecteffect.cpp b/gm/aarecteffect.cpp
index 8f4c446..1b1e74c 100644
--- a/gm/aarecteffect.cpp
+++ b/gm/aarecteffect.cpp
@@ -20,8 +20,8 @@
#include "src/core/SkCanvasPriv.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrPaint.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tools/gpu/TestOps.h"
#include <memory>
diff --git a/gm/attributes.cpp b/gm/attributes.cpp
index f6d7088..ac48723 100644
--- a/gm/attributes.cpp
+++ b/gm/attributes.cpp
@@ -20,11 +20,11 @@
#include "src/gpu/ganesh/GrProgramInfo.h"
#include "src/gpu/ganesh/GrResourceProvider.h"
#include "src/gpu/ganesh/GrShaderVar.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
#include "src/gpu/ganesh/ops/GrOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tools/gpu/ProxyUtils.h"
#include <memory>
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 85a8aab..edefd07 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -39,6 +39,7 @@
#include "src/gpu/ganesh/GrProgramInfo.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
#include "src/gpu/ganesh/GrUserStencilSettings.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrBezierEffect.h"
#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h"
#include "src/gpu/ganesh/geometry/GrPathUtils.h"
@@ -46,7 +47,6 @@
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
#include "src/gpu/ganesh/ops/GrOp.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include <memory>
#include <utility>
diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp
index bc66608..ceeae90 100644
--- a/gm/bigrrectaaeffect.cpp
+++ b/gm/bigrrectaaeffect.cpp
@@ -22,11 +22,11 @@
#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrPaint.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h"
#include "src/gpu/ganesh/effects/GrRRectEffect.h"
#include "src/gpu/ganesh/ops/FillRectOp.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tools/ToolUtils.h"
#include <memory>
diff --git a/gm/clockwise.cpp b/gm/clockwise.cpp
index 94428d8..ea7c826 100644
--- a/gm/clockwise.cpp
+++ b/gm/clockwise.cpp
@@ -42,11 +42,11 @@
#include "src/gpu/ganesh/GrShaderVar.h"
#include "src/gpu/ganesh/GrSurfaceProxy.h"
#include "src/gpu/ganesh/GrTextureProxy.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLVarying.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
#include "src/gpu/ganesh/ops/GrOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tools/gpu/ProxyUtils.h"
#include <memory>
diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp
index cbf8f79..4632db3 100644
--- a/gm/constcolorprocessor.cpp
+++ b/gm/constcolorprocessor.cpp
@@ -34,8 +34,8 @@
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrPaint.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/ops/GrOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tools/ToolUtils.h"
#include "tools/gpu/TestOps.h"
diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index 182c3cc..b15db54 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -22,9 +22,9 @@
#include "src/core/SkCanvasPriv.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrPaint.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrConvexPolyEffect.h"
#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tools/gpu/TestOps.h"
#include <memory>
diff --git a/gm/destcolor.cpp b/gm/destcolor.cpp
index 627bbe2..96dce5d 100644
--- a/gm/destcolor.cpp
+++ b/gm/destcolor.cpp
@@ -17,8 +17,8 @@
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrStyle.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tools/Resources.h"
#include "tools/ToolUtils.h"
diff --git a/gm/drawquadset.cpp b/gm/drawquadset.cpp
index d789b75..89a4d48 100644
--- a/gm/drawquadset.cpp
+++ b/gm/drawquadset.cpp
@@ -28,7 +28,7 @@
#include "src/core/SkMatrixProvider.h"
#include "src/gpu/ganesh/GrPaint.h"
#include "src/gpu/ganesh/SkGr.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "tools/ToolUtils.h"
#include <utility>
diff --git a/gm/fp_sample_chaining.cpp b/gm/fp_sample_chaining.cpp
index cbfe26f..5553510 100644
--- a/gm/fp_sample_chaining.cpp
+++ b/gm/fp_sample_chaining.cpp
@@ -13,10 +13,10 @@
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "src/gpu/ganesh/GrPaint.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrMatrixEffect.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tools/ToolUtils.h"
namespace {
diff --git a/gm/fwidth_squircle.cpp b/gm/fwidth_squircle.cpp
index 8597036..28854f9 100644
--- a/gm/fwidth_squircle.cpp
+++ b/gm/fwidth_squircle.cpp
@@ -33,6 +33,7 @@
#include "src/gpu/ganesh/GrResourceProvider.h"
#include "src/gpu/ganesh/GrShaderCaps.h"
#include "src/gpu/ganesh/GrShaderVar.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h"
#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h"
@@ -40,7 +41,6 @@
#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
#include "src/gpu/ganesh/ops/GrOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tools/gpu/ProxyUtils.h"
#include <memory>
diff --git a/gm/gpu_blur_utils.cpp b/gm/gpu_blur_utils.cpp
index 5d87e61..1f152c7 100644
--- a/gm/gpu_blur_utils.cpp
+++ b/gm/gpu_blur_utils.cpp
@@ -15,9 +15,9 @@
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
#include "src/gpu/ganesh/GrStyle.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "src/image/SkImage_Base.h"
namespace {
diff --git a/gm/lazytiling.cpp b/gm/lazytiling.cpp
index c32d2d1..422d665 100644
--- a/gm/lazytiling.cpp
+++ b/gm/lazytiling.cpp
@@ -20,8 +20,8 @@
#include "src/gpu/ganesh/GrProxyProvider.h"
#include "src/gpu/ganesh/GrResourceProvider.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tools/gpu/ProxyUtils.h"
static GrSurfaceProxyView create_view(GrDirectContext* dContext,
diff --git a/gm/preservefillrule.cpp b/gm/preservefillrule.cpp
index 73b5fa9..cb33539 100644
--- a/gm/preservefillrule.cpp
+++ b/gm/preservefillrule.cpp
@@ -14,7 +14,7 @@
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "src/gpu/ganesh/GrDrawingManager.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "tools/ToolUtils.h"
namespace skiagm {
diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index 7c61816..c7fedb1 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -23,11 +23,11 @@
#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrPaint.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h"
#include "src/gpu/ganesh/effects/GrRRectEffect.h"
#include "src/gpu/ganesh/ops/FillRectOp.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include <memory>
#include <utility>
diff --git a/gm/texelsubset.cpp b/gm/texelsubset.cpp
index 2c8d937..72b1f2b 100644
--- a/gm/texelsubset.cpp
+++ b/gm/texelsubset.cpp
@@ -22,8 +22,8 @@
#include "src/gpu/ganesh/GrProxyProvider.h"
#include "src/gpu/ganesh/GrSamplerState.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tools/Resources.h"
#include "tools/gpu/TestOps.h"
diff --git a/gm/yuvtorgbsubset.cpp b/gm/yuvtorgbsubset.cpp
index b6e000b..4f35ca3 100644
--- a/gm/yuvtorgbsubset.cpp
+++ b/gm/yuvtorgbsubset.cpp
@@ -23,8 +23,8 @@
#include "src/gpu/ganesh/GrTextureProxy.h"
#include "src/gpu/ganesh/GrYUVATextureProxies.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrYUVtoRGBEffect.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include <memory>
#include <utility>
diff --git a/gn/gpu.gni b/gn/gpu.gni
index c331046..461cc75 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -30,6 +30,11 @@
"$_include/private/gpu/ganesh/GrTypesPriv.h",
"$_src/gpu/GrAHardwareBufferUtils.h",
"$_src/gpu/GrRectanizer.h",
+ "$_src/gpu/ganesh/ClipStack.cpp",
+ "$_src/gpu/ganesh/ClipStack.h",
+ "$_src/gpu/ganesh/Device.cpp",
+ "$_src/gpu/ganesh/Device_drawTexture.cpp",
+ "$_src/gpu/ganesh/Device_v1.h",
"$_src/gpu/ganesh/GrAHardwareBufferImageGenerator.cpp",
"$_src/gpu/ganesh/GrAHardwareBufferImageGenerator.h",
"$_src/gpu/ganesh/GrAHardwareBufferUtils.cpp",
@@ -37,6 +42,7 @@
"$_src/gpu/ganesh/GrAppliedClip.h",
"$_src/gpu/ganesh/GrAttachment.cpp",
"$_src/gpu/ganesh/GrAttachment.h",
+ "$_src/gpu/ganesh/GrAuditTrail.cpp",
"$_src/gpu/ganesh/GrAuditTrail.h",
"$_src/gpu/ganesh/GrAutoLocaleSetter.h",
"$_src/gpu/ganesh/GrBackendSemaphore.cpp",
@@ -48,6 +54,8 @@
"$_src/gpu/ganesh/GrBackendUtils.cpp",
"$_src/gpu/ganesh/GrBackendUtils.h",
"$_src/gpu/ganesh/GrBaseContextPriv.h",
+ "$_src/gpu/ganesh/GrBlurUtils.cpp",
+ "$_src/gpu/ganesh/GrBlurUtils.h",
"$_src/gpu/ganesh/GrBuffer.h",
"$_src/gpu/ganesh/GrBufferAllocPool.cpp",
"$_src/gpu/ganesh/GrBufferAllocPool.h",
@@ -86,6 +94,8 @@
"$_src/gpu/ganesh/GrDrawIndirectCommand.h",
"$_src/gpu/ganesh/GrDrawOpAtlas.cpp",
"$_src/gpu/ganesh/GrDrawOpAtlas.h",
+ "$_src/gpu/ganesh/GrDrawOpTest.cpp",
+ "$_src/gpu/ganesh/GrDrawOpTest.h",
"$_src/gpu/ganesh/GrDrawingManager.cpp",
"$_src/gpu/ganesh/GrDrawingManager.h",
"$_src/gpu/ganesh/GrDriverBugWorkarounds.cpp",
@@ -239,10 +249,21 @@
"$_src/gpu/ganesh/GrYUVABackendTextures.cpp",
"$_src/gpu/ganesh/GrYUVATextureProxies.cpp",
"$_src/gpu/ganesh/GrYUVATextureProxies.h",
+ "$_src/gpu/ganesh/PathRenderer.cpp",
+ "$_src/gpu/ganesh/PathRenderer.h",
+ "$_src/gpu/ganesh/PathRendererChain.cpp",
+ "$_src/gpu/ganesh/PathRendererChain.h",
+ "$_src/gpu/ganesh/StencilClip.h",
+ "$_src/gpu/ganesh/StencilMaskHelper.cpp",
+ "$_src/gpu/ganesh/StencilMaskHelper.h",
"$_src/gpu/ganesh/SurfaceContext.cpp",
"$_src/gpu/ganesh/SurfaceContext.h",
+ "$_src/gpu/ganesh/SurfaceDrawContext.cpp",
+ "$_src/gpu/ganesh/SurfaceDrawContext.h",
"$_src/gpu/ganesh/SurfaceFillContext.cpp",
"$_src/gpu/ganesh/SurfaceFillContext.h",
+ "$_src/gpu/ganesh/SurfaceFillContext_v1.cpp",
+ "$_src/gpu/ganesh/SurfaceFillContext_v1.h",
# Ops
"$_src/gpu/ganesh/effects/GrAtlasedShaderHelpers.h",
@@ -438,12 +459,6 @@
[ "$_src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp" ]
skia_skgpu_v1_sources = [
- "$_src/gpu/ganesh/GrAuditTrail.cpp",
- "$_src/gpu/ganesh/GrBlurUtils.cpp",
- "$_src/gpu/ganesh/GrBlurUtils.h",
- "$_src/gpu/ganesh/GrDrawOpTest.cpp",
- "$_src/gpu/ganesh/GrDrawOpTest.h",
-
# Ops
"$_src/gpu/ganesh/ops/AAConvexPathRenderer.cpp",
"$_src/gpu/ganesh/ops/AAConvexPathRenderer.h",
@@ -525,24 +540,6 @@
"$_src/gpu/ganesh/ops/TextureOp.h",
"$_src/gpu/ganesh/ops/TriangulatingPathRenderer.cpp",
"$_src/gpu/ganesh/ops/TriangulatingPathRenderer.h",
-
- # v1
- "$_src/gpu/ganesh/v1/ClipStack.cpp",
- "$_src/gpu/ganesh/v1/ClipStack.h",
- "$_src/gpu/ganesh/v1/Device.cpp",
- "$_src/gpu/ganesh/v1/Device_drawTexture.cpp",
- "$_src/gpu/ganesh/v1/Device_v1.h",
- "$_src/gpu/ganesh/v1/PathRenderer.cpp",
- "$_src/gpu/ganesh/v1/PathRenderer.h",
- "$_src/gpu/ganesh/v1/PathRendererChain.cpp",
- "$_src/gpu/ganesh/v1/PathRendererChain.h",
- "$_src/gpu/ganesh/v1/StencilClip.h",
- "$_src/gpu/ganesh/v1/StencilMaskHelper.cpp",
- "$_src/gpu/ganesh/v1/StencilMaskHelper.h",
- "$_src/gpu/ganesh/v1/SurfaceDrawContext.cpp",
- "$_src/gpu/ganesh/v1/SurfaceDrawContext_v1.h",
- "$_src/gpu/ganesh/v1/SurfaceFillContext_v1.cpp",
- "$_src/gpu/ganesh/v1/SurfaceFillContext_v1.h",
]
skia_gpu_sources += skia_skgpu_v1_sources
diff --git a/public.bzl b/public.bzl
index ecfe5f9..29a9934 100644
--- a/public.bzl
+++ b/public.bzl
@@ -1018,10 +1018,26 @@
"src/gpu/ganesh/GrYUVATextureProxies.h",
"src/gpu/ganesh/SkGr.cpp",
"src/gpu/ganesh/SkGr.h",
+ "src/gpu/ganesh/ClipStack.cpp",
+ "src/gpu/ganesh/ClipStack.h",
+ "src/gpu/ganesh/Device.cpp",
+ "src/gpu/ganesh/Device_drawTexture.cpp",
+ "src/gpu/ganesh/Device_v1.h",
+ "src/gpu/ganesh/PathRenderer.cpp",
+ "src/gpu/ganesh/PathRenderer.h",
+ "src/gpu/ganesh/PathRendererChain.cpp",
+ "src/gpu/ganesh/PathRendererChain.h",
+ "src/gpu/ganesh/StencilClip.h",
+ "src/gpu/ganesh/StencilMaskHelper.cpp",
+ "src/gpu/ganesh/StencilMaskHelper.h",
"src/gpu/ganesh/SurfaceContext.cpp",
"src/gpu/ganesh/SurfaceContext.h",
+ "src/gpu/ganesh/SurfaceDrawContext.cpp",
+ "src/gpu/ganesh/SurfaceDrawContext.h",
"src/gpu/ganesh/SurfaceFillContext.cpp",
"src/gpu/ganesh/SurfaceFillContext.h",
+ "src/gpu/ganesh/SurfaceFillContext_v1.cpp",
+ "src/gpu/ganesh/SurfaceFillContext_v1.h",
"src/gpu/ganesh/effects/GrAtlasedShaderHelpers.h",
"src/gpu/ganesh/effects/GrBezierEffect.cpp",
"src/gpu/ganesh/effects/GrBezierEffect.h",
@@ -1209,22 +1225,6 @@
"src/gpu/ganesh/tessellate/VertexChunkPatchAllocator.h",
"src/gpu/ganesh/text/GrAtlasManager.cpp",
"src/gpu/ganesh/text/GrAtlasManager.h",
- "src/gpu/ganesh/v1/ClipStack.cpp",
- "src/gpu/ganesh/v1/ClipStack.h",
- "src/gpu/ganesh/v1/Device.cpp",
- "src/gpu/ganesh/v1/Device_drawTexture.cpp",
- "src/gpu/ganesh/v1/Device_v1.h",
- "src/gpu/ganesh/v1/PathRenderer.cpp",
- "src/gpu/ganesh/v1/PathRenderer.h",
- "src/gpu/ganesh/v1/PathRendererChain.cpp",
- "src/gpu/ganesh/v1/PathRendererChain.h",
- "src/gpu/ganesh/v1/StencilClip.h",
- "src/gpu/ganesh/v1/StencilMaskHelper.cpp",
- "src/gpu/ganesh/v1/StencilMaskHelper.h",
- "src/gpu/ganesh/v1/SurfaceDrawContext.cpp",
- "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h",
- "src/gpu/ganesh/v1/SurfaceFillContext_v1.cpp",
- "src/gpu/ganesh/v1/SurfaceFillContext_v1.h",
"src/gpu/tessellate/AffineMatrix.h",
"src/gpu/tessellate/CullTest.h",
"src/gpu/tessellate/FixedCountBufferUtils.cpp",
diff --git a/samplecode/SamplePathTessellators.cpp b/samplecode/SamplePathTessellators.cpp
index 824bc08..3e161c7 100644
--- a/samplecode/SamplePathTessellators.cpp
+++ b/samplecode/SamplePathTessellators.cpp
@@ -14,12 +14,12 @@
#include "src/core/SkCanvasPriv.h"
#include "src/gpu/ganesh/GrOpFlushState.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h"
#include "src/gpu/ganesh/ops/TessellationPathRenderer.h"
#include "src/gpu/ganesh/tessellate/GrPathTessellationShader.h"
#include "src/gpu/ganesh/tessellate/PathTessellator.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "src/gpu/tessellate/AffineMatrix.h"
#include "src/gpu/tessellate/MiddleOutPolygonTriangulator.h"
diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp
index a6407a0..2e74d57 100644
--- a/src/core/SkBlurMF.cpp
+++ b/src/core/SkBlurMF.cpp
@@ -40,7 +40,7 @@
#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h"
#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h"
#if SK_GPU_V1
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#endif // SK_GPU_V1
#endif // SK_SUPPORT_GPU
diff --git a/src/core/SkCanvasPriv.cpp b/src/core/SkCanvasPriv.cpp
index ee3b979..b6e264b 100644
--- a/src/core/SkCanvasPriv.cpp
+++ b/src/core/SkCanvasPriv.cpp
@@ -104,7 +104,7 @@
#if GR_TEST_UTILS
#if SK_SUPPORT_GPU
-#include "src/gpu/ganesh/v1/Device_v1.h"
+#include "src/gpu/ganesh/Device_v1.h"
#if SK_GPU_V1
skgpu::v1::SurfaceDrawContext* SkCanvasPriv::TopDeviceSurfaceDrawContext(SkCanvas* canvas) {
@@ -141,7 +141,7 @@
#endif // GR_TEST_UTILS
#if SK_SUPPORT_GPU
-#include "src/gpu/ganesh/v1/Device_v1.h"
+#include "src/gpu/ganesh/Device_v1.h"
GrRenderTargetProxy* SkCanvasPriv::TopDeviceTargetProxy(SkCanvas* canvas) {
if (auto gpuDevice = canvas->topDevice()->asGaneshDevice()) {
diff --git a/src/core/SkGlyphRunPainter.cpp b/src/core/SkGlyphRunPainter.cpp
index 816ad0a..08d144e 100644
--- a/src/core/SkGlyphRunPainter.cpp
+++ b/src/core/SkGlyphRunPainter.cpp
@@ -11,7 +11,7 @@
#if SK_SUPPORT_GPU
#include "src/gpu/ganesh/GrColorInfo.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/text/gpu/SDFTControl.h"
#include "src/text/gpu/TextBlobRedrawCoordinator.h"
#endif // SK_SUPPORT_GPU
diff --git a/src/core/SkGpuBlurUtils.cpp b/src/core/SkGpuBlurUtils.cpp
index 13d3a81..2d09ffc 100644
--- a/src/core/SkGpuBlurUtils.cpp
+++ b/src/core/SkGpuBlurUtils.cpp
@@ -22,7 +22,7 @@
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
#if SK_GPU_V1
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
using Direction = GrGaussianConvolutionFragmentProcessor::Direction;
diff --git a/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp b/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp
index 0b3894f..d3a246b 100644
--- a/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp
+++ b/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp
@@ -24,7 +24,7 @@
#include "src/gpu/ganesh/effects/GrSkSLFP.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
#if SK_GPU_V1
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#endif // SK_GPU_V1
#endif // SK_SUPPORT_GPU
diff --git a/src/effects/imagefilters/SkBlurImageFilter.cpp b/src/effects/imagefilters/SkBlurImageFilter.cpp
index 5be2832..c0f9419 100644
--- a/src/effects/imagefilters/SkBlurImageFilter.cpp
+++ b/src/effects/imagefilters/SkBlurImageFilter.cpp
@@ -27,7 +27,7 @@
#include "src/gpu/ganesh/GrTextureProxy.h"
#include "src/gpu/ganesh/SkGr.h"
#if SK_GPU_V1
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#endif // SK_GPU_V1
#endif // SK_SUPPORT_GPU
diff --git a/src/gpu/ganesh/BUILD.bazel b/src/gpu/ganesh/BUILD.bazel
index e4f1535..02b945d 100644
--- a/src/gpu/ganesh/BUILD.bazel
+++ b/src/gpu/ganesh/BUILD.bazel
@@ -222,10 +222,26 @@
"GrYUVATextureProxies.h",
"SkGr.cpp",
"SkGr.h",
+ "ClipStack.cpp",
+ "ClipStack.h",
+ "Device.cpp",
+ "Device_drawTexture.cpp",
+ "Device_v1.h",
+ "PathRenderer.cpp",
+ "PathRenderer.h",
+ "PathRendererChain.cpp",
+ "PathRendererChain.h",
+ "StencilClip.h",
+ "StencilMaskHelper.cpp",
+ "StencilMaskHelper.h",
"SurfaceContext.cpp",
"SurfaceContext.h",
+ "SurfaceDrawContext.cpp",
+ "SurfaceDrawContext.h",
"SurfaceFillContext.cpp",
"SurfaceFillContext.h",
+ "SurfaceFillContext_v1.cpp",
+ "SurfaceFillContext_v1.h",
]
split_srcs_and_hdrs(
@@ -245,7 +261,6 @@
"//src/gpu/ganesh/tessellate:srcs",
"//src/gpu/ganesh/ops:srcs",
"//src/gpu/ganesh/text:srcs",
- "//src/gpu/ganesh/v1:srcs",
] + select_multi(
{
"//src/gpu:dawn_backend": ["//src/gpu/ganesh/dawn:srcs"],
@@ -269,7 +284,6 @@
"//src/gpu/ganesh/tessellate:private_hdrs",
"//src/gpu/ganesh/ops:private_hdrs",
"//src/gpu/ganesh/text:private_hdrs",
- "//src/gpu/ganesh/v1:private_hdrs",
] + select_multi(
{
"//src/gpu:dawn_backend": ["//src/gpu/ganesh/dawn:private_hdrs"],
diff --git a/src/gpu/ganesh/v1/ClipStack.cpp b/src/gpu/ganesh/ClipStack.cpp
similarity index 99%
rename from src/gpu/ganesh/v1/ClipStack.cpp
rename to src/gpu/ganesh/ClipStack.cpp
index e79f5a8..8b7be1e 100644
--- a/src/gpu/ganesh/v1/ClipStack.cpp
+++ b/src/gpu/ganesh/ClipStack.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "src/gpu/ganesh/v1/ClipStack.h"
+#include "src/gpu/ganesh/ClipStack.h"
#include "include/core/SkColorSpace.h"
#include "include/core/SkMatrix.h"
@@ -21,6 +21,8 @@
#include "src/gpu/ganesh/GrProxyProvider.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
#include "src/gpu/ganesh/GrSWMaskHelper.h"
+#include "src/gpu/ganesh/StencilMaskHelper.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h"
#include "src/gpu/ganesh/effects/GrConvexPolyEffect.h"
#include "src/gpu/ganesh/effects/GrRRectEffect.h"
@@ -28,8 +30,6 @@
#include "src/gpu/ganesh/geometry/GrQuadUtils.h"
#include "src/gpu/ganesh/ops/AtlasPathRenderer.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
-#include "src/gpu/ganesh/v1/StencilMaskHelper.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
namespace {
diff --git a/src/gpu/ganesh/v1/ClipStack.h b/src/gpu/ganesh/ClipStack.h
similarity index 100%
rename from src/gpu/ganesh/v1/ClipStack.h
rename to src/gpu/ganesh/ClipStack.h
diff --git a/src/gpu/ganesh/v1/Device.cpp b/src/gpu/ganesh/Device.cpp
similarity index 99%
rename from src/gpu/ganesh/v1/Device.cpp
rename to src/gpu/ganesh/Device.cpp
index 507e615..a9f1f43 100644
--- a/src/gpu/ganesh/v1/Device.cpp
+++ b/src/gpu/ganesh/Device.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "src/gpu/ganesh/v1/Device_v1.h"
+#include "src/gpu/ganesh/Device_v1.h"
#include "include/core/SkImageFilter.h"
#include "include/core/SkMaskFilter.h"
@@ -44,10 +44,10 @@
#include "src/gpu/ganesh/GrTracing.h"
#include "src/gpu/ganesh/SkGr.h"
#include "src/gpu/ganesh/SurfaceContext.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrDisableColorXP.h"
#include "src/gpu/ganesh/effects/GrRRectEffect.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "src/image/SkImage_Base.h"
#include "src/image/SkReadPixelsRec.h"
#include "src/image/SkSurface_Gpu.h"
diff --git a/src/gpu/ganesh/v1/Device_drawTexture.cpp b/src/gpu/ganesh/Device_drawTexture.cpp
similarity index 99%
rename from src/gpu/ganesh/v1/Device_drawTexture.cpp
rename to src/gpu/ganesh/Device_drawTexture.cpp
index 22bbe1d..db5e280 100644
--- a/src/gpu/ganesh/v1/Device_drawTexture.cpp
+++ b/src/gpu/ganesh/Device_drawTexture.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "src/gpu/ganesh/v1/Device_v1.h"
+#include "src/gpu/ganesh/Device_v1.h"
#include "include/core/SkBitmap.h"
#include "include/gpu/GrDirectContext.h"
@@ -23,12 +23,12 @@
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
#include "src/gpu/ganesh/GrStyle.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrBicubicEffect.h"
#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
#include "src/gpu/ganesh/geometry/GrRect.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "src/image/SkImage_Base.h"
#include "src/image/SkImage_Gpu.h"
diff --git a/src/gpu/ganesh/v1/Device_v1.h b/src/gpu/ganesh/Device_v1.h
similarity index 99%
rename from src/gpu/ganesh/v1/Device_v1.h
rename to src/gpu/ganesh/Device_v1.h
index ca74397..a6594cd 100644
--- a/src/gpu/ganesh/v1/Device_v1.h
+++ b/src/gpu/ganesh/Device_v1.h
@@ -11,8 +11,8 @@
#include "include/core/SkSurface.h"
#include "include/gpu/GrTypes.h"
#include "src/core/SkDevice.h"
+#include "src/gpu/ganesh/ClipStack.h"
#include "src/gpu/ganesh/SkGr.h"
-#include "src/gpu/ganesh/v1/ClipStack.h"
#include "src/text/gpu/SDFTControl.h"
class SkBitmap;
diff --git a/src/gpu/ganesh/GrBlurUtils.cpp b/src/gpu/ganesh/GrBlurUtils.cpp
index 3ad3408..b46845f 100644
--- a/src/gpu/ganesh/GrBlurUtils.cpp
+++ b/src/gpu/ganesh/GrBlurUtils.cpp
@@ -29,9 +29,9 @@
#include "src/gpu/ganesh/GrThreadSafeCache.h"
#include "src/gpu/ganesh/GrUtil.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
static bool clip_bounds_quick_reject(const SkIRect& clipBounds, const SkIRect& rect) {
return clipBounds.isEmpty() || rect.isEmpty() || !SkIRect::Intersects(clipBounds, rect);
diff --git a/src/gpu/ganesh/GrDirectContextPriv.h b/src/gpu/ganesh/GrDirectContextPriv.h
index 8dab6c8..dfad01b 100644
--- a/src/gpu/ganesh/GrDirectContextPriv.h
+++ b/src/gpu/ganesh/GrDirectContextPriv.h
@@ -12,8 +12,8 @@
#include "include/core/SkSurface.h"
#include "include/gpu/GrDirectContext.h"
#include "src/gpu/AtlasTypes.h"
+#include "src/gpu/ganesh/Device_v1.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
-#include "src/gpu/ganesh/v1/Device_v1.h"
class GrAtlasManager;
class GrBackendFormat;
diff --git a/src/gpu/ganesh/GrDrawingManager.h b/src/gpu/ganesh/GrDrawingManager.h
index 6334f98..27a90fe 100644
--- a/src/gpu/ganesh/GrDrawingManager.h
+++ b/src/gpu/ganesh/GrDrawingManager.h
@@ -19,8 +19,8 @@
#include "src/gpu/ganesh/GrSurfaceProxy.h"
#if SK_GPU_V1
-#include "src/gpu/ganesh/v1/PathRenderer.h"
-#include "src/gpu/ganesh/v1/PathRendererChain.h"
+#include "src/gpu/ganesh/PathRenderer.h"
+#include "src/gpu/ganesh/PathRendererChain.h"
#endif
// Enabling this will print out which path renderers are being chosen
diff --git a/src/gpu/ganesh/GrRecordingContextPriv.cpp b/src/gpu/ganesh/GrRecordingContextPriv.cpp
index bada215..45801cba 100644
--- a/src/gpu/ganesh/GrRecordingContextPriv.cpp
+++ b/src/gpu/ganesh/GrRecordingContextPriv.cpp
@@ -15,9 +15,9 @@
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
#if SK_GPU_V1
-#include "src/gpu/ganesh/v1/Device_v1.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
-#include "src/gpu/ganesh/v1/SurfaceFillContext_v1.h"
+#include "src/gpu/ganesh/Device_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
+#include "src/gpu/ganesh/SurfaceFillContext_v1.h"
#endif
void GrRecordingContextPriv::addOnFlushCallbackObject(GrOnFlushCallbackObject* onFlushCBObject) {
diff --git a/src/gpu/ganesh/GrRecordingContextPriv.h b/src/gpu/ganesh/GrRecordingContextPriv.h
index 0824921..1100747 100644
--- a/src/gpu/ganesh/GrRecordingContextPriv.h
+++ b/src/gpu/ganesh/GrRecordingContextPriv.h
@@ -11,8 +11,8 @@
#include "include/core/SkPaint.h"
#include "include/gpu/GrRecordingContext.h"
#include "src/gpu/RefCntedCallback.h"
+#include "src/gpu/ganesh/Device_v1.h"
#include "src/gpu/ganesh/GrImageContextPriv.h"
-#include "src/gpu/ganesh/v1/Device_v1.h"
#include "src/text/gpu/SDFTControl.h"
class GrImageInfo;
diff --git a/src/gpu/ganesh/GrRenderTargetContext.h b/src/gpu/ganesh/GrRenderTargetContext.h
index ac22491..4f0c406 100644
--- a/src/gpu/ganesh/GrRenderTargetContext.h
+++ b/src/gpu/ganesh/GrRenderTargetContext.h
@@ -12,7 +12,7 @@
#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
// Android Framework is relying on this header existing and the old name
// of skgpu::v1::SurfaceDrawContext.
diff --git a/src/gpu/ganesh/v1/PathRenderer.cpp b/src/gpu/ganesh/PathRenderer.cpp
similarity index 97%
rename from src/gpu/ganesh/v1/PathRenderer.cpp
rename to src/gpu/ganesh/PathRenderer.cpp
index 0c6d5ea..20d5d85 100644
--- a/src/gpu/ganesh/v1/PathRenderer.cpp
+++ b/src/gpu/ganesh/PathRenderer.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "src/gpu/ganesh/v1/PathRenderer.h"
+#include "src/gpu/ganesh/PathRenderer.h"
#include "include/gpu/GrRecordingContext.h"
#include "src/core/SkDrawProcs.h"
@@ -15,7 +15,7 @@
#include "src/gpu/ganesh/GrUserStencilSettings.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
#ifdef SK_DEBUG
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#endif
namespace skgpu::v1 {
diff --git a/src/gpu/ganesh/v1/PathRenderer.h b/src/gpu/ganesh/PathRenderer.h
similarity index 100%
rename from src/gpu/ganesh/v1/PathRenderer.h
rename to src/gpu/ganesh/PathRenderer.h
diff --git a/src/gpu/ganesh/v1/PathRendererChain.cpp b/src/gpu/ganesh/PathRendererChain.cpp
similarity index 98%
rename from src/gpu/ganesh/v1/PathRendererChain.cpp
rename to src/gpu/ganesh/PathRendererChain.cpp
index 50b5a94..e4a1950 100644
--- a/src/gpu/ganesh/v1/PathRendererChain.cpp
+++ b/src/gpu/ganesh/PathRendererChain.cpp
@@ -6,7 +6,7 @@
*/
-#include "src/gpu/ganesh/v1/PathRendererChain.h"
+#include "src/gpu/ganesh/PathRendererChain.h"
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrRecordingContext.h"
diff --git a/src/gpu/ganesh/v1/PathRendererChain.h b/src/gpu/ganesh/PathRendererChain.h
similarity index 98%
rename from src/gpu/ganesh/v1/PathRendererChain.h
rename to src/gpu/ganesh/PathRendererChain.h
index 95fc5b8..2a7b5b4 100644
--- a/src/gpu/ganesh/v1/PathRendererChain.h
+++ b/src/gpu/ganesh/PathRendererChain.h
@@ -8,7 +8,7 @@
#ifndef PathRendererChain_DEFINED
#define PathRendererChain_DEFINED
-#include "src/gpu/ganesh/v1/PathRenderer.h"
+#include "src/gpu/ganesh/PathRenderer.h"
#include "include/core/SkTypes.h"
#include "include/private/SkNoncopyable.h"
diff --git a/src/gpu/ganesh/v1/StencilClip.h b/src/gpu/ganesh/StencilClip.h
similarity index 100%
rename from src/gpu/ganesh/v1/StencilClip.h
rename to src/gpu/ganesh/StencilClip.h
diff --git a/src/gpu/ganesh/v1/StencilMaskHelper.cpp b/src/gpu/ganesh/StencilMaskHelper.cpp
similarity index 99%
rename from src/gpu/ganesh/v1/StencilMaskHelper.cpp
rename to src/gpu/ganesh/StencilMaskHelper.cpp
index a57e27e..32b7e8e 100644
--- a/src/gpu/ganesh/v1/StencilMaskHelper.cpp
+++ b/src/gpu/ganesh/StencilMaskHelper.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
-#include "src/gpu/ganesh/v1/StencilMaskHelper.h"
+#include "src/gpu/ganesh/StencilMaskHelper.h"
#include "include/core/SkMatrix.h"
#include "include/core/SkPath.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
#include "src/gpu/ganesh/GrStencilSettings.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrDisableColorXP.h"
#include "src/gpu/ganesh/geometry/GrShape.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
namespace {
diff --git a/src/gpu/ganesh/v1/StencilMaskHelper.h b/src/gpu/ganesh/StencilMaskHelper.h
similarity index 97%
rename from src/gpu/ganesh/v1/StencilMaskHelper.h
rename to src/gpu/ganesh/StencilMaskHelper.h
index ba019b1..7d15bc9 100644
--- a/src/gpu/ganesh/v1/StencilMaskHelper.h
+++ b/src/gpu/ganesh/StencilMaskHelper.h
@@ -8,7 +8,7 @@
#ifndef StencilMaskHelper_DEFINED
#define StencilMaskHelper_DEFINED
-#include "src/gpu/ganesh/v1/StencilClip.h"
+#include "src/gpu/ganesh/StencilClip.h"
class GrShape;
class GrRecordingContext;
diff --git a/src/gpu/ganesh/v1/SurfaceDrawContext.cpp b/src/gpu/ganesh/SurfaceDrawContext.cpp
similarity index 99%
rename from src/gpu/ganesh/v1/SurfaceDrawContext.cpp
rename to src/gpu/ganesh/SurfaceDrawContext.cpp
index 3ea884d..27fea48 100644
--- a/src/gpu/ganesh/v1/SurfaceDrawContext.cpp
+++ b/src/gpu/ganesh/SurfaceDrawContext.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "include/core/SkColorSpace.h"
#include "include/core/SkDrawable.h"
@@ -47,6 +47,7 @@
#include "src/gpu/ganesh/GrStencilSettings.h"
#include "src/gpu/ganesh/GrStyle.h"
#include "src/gpu/ganesh/GrTracing.h"
+#include "src/gpu/ganesh/PathRenderer.h"
#include "src/gpu/ganesh/SkGr.h"
#include "src/gpu/ganesh/effects/GrBicubicEffect.h"
#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h"
@@ -70,7 +71,6 @@
#include "src/gpu/ganesh/ops/ShadowRRectOp.h"
#include "src/gpu/ganesh/ops/StrokeRectOp.h"
#include "src/gpu/ganesh/ops/TextureOp.h"
-#include "src/gpu/ganesh/v1/PathRenderer.h"
#include "src/text/gpu/SDFTControl.h"
#include "src/text/gpu/TextBlobRedrawCoordinator.h"
diff --git a/src/gpu/ganesh/v1/SurfaceDrawContext_v1.h b/src/gpu/ganesh/SurfaceDrawContext.h
similarity index 99%
rename from src/gpu/ganesh/v1/SurfaceDrawContext_v1.h
rename to src/gpu/ganesh/SurfaceDrawContext.h
index f6ad507..9658296 100644
--- a/src/gpu/ganesh/v1/SurfaceDrawContext_v1.h
+++ b/src/gpu/ganesh/SurfaceDrawContext.h
@@ -18,9 +18,9 @@
#include "src/gpu/ganesh/GrRenderTargetProxy.h"
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
#include "src/gpu/ganesh/GrXferProcessor.h"
+#include "src/gpu/ganesh/SurfaceFillContext_v1.h"
#include "src/gpu/ganesh/geometry/GrQuad.h"
#include "src/gpu/ganesh/ops/OpsTask.h"
-#include "src/gpu/ganesh/v1/SurfaceFillContext_v1.h"
class GrBackendSemaphore;
class GrClip;
diff --git a/src/gpu/ganesh/v1/SurfaceFillContext_v1.cpp b/src/gpu/ganesh/SurfaceFillContext_v1.cpp
similarity index 98%
rename from src/gpu/ganesh/v1/SurfaceFillContext_v1.cpp
rename to src/gpu/ganesh/SurfaceFillContext_v1.cpp
index a2f767f..58a4264 100644
--- a/src/gpu/ganesh/v1/SurfaceFillContext_v1.cpp
+++ b/src/gpu/ganesh/SurfaceFillContext_v1.cpp
@@ -5,18 +5,18 @@
* found in the LICENSE file.
*/
-#include "src/gpu/ganesh/v1/SurfaceFillContext_v1.h"
+#include "src/gpu/ganesh/SurfaceFillContext_v1.h"
#include "include/private/gpu/ganesh/GrImageContext.h"
#include "src/gpu/ganesh/GrDstProxyView.h"
#include "src/gpu/ganesh/GrImageContextPriv.h"
#include "src/gpu/ganesh/GrProxyProvider.h"
#include "src/gpu/ganesh/GrTextureResolveRenderTask.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
#include "src/gpu/ganesh/geometry/GrRect.h"
#include "src/gpu/ganesh/ops/ClearOp.h"
#include "src/gpu/ganesh/ops/FillRectOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(this->singleOwner())
#define RETURN_IF_ABANDONED if (fContext->abandoned()) { return; }
diff --git a/src/gpu/ganesh/v1/SurfaceFillContext_v1.h b/src/gpu/ganesh/SurfaceFillContext_v1.h
similarity index 100%
rename from src/gpu/ganesh/v1/SurfaceFillContext_v1.h
rename to src/gpu/ganesh/SurfaceFillContext_v1.h
diff --git a/src/gpu/ganesh/ops/AAConvexPathRenderer.cpp b/src/gpu/ganesh/ops/AAConvexPathRenderer.cpp
index 935c075..9b7f608 100644
--- a/src/gpu/ganesh/ops/AAConvexPathRenderer.cpp
+++ b/src/gpu/ganesh/ops/AAConvexPathRenderer.cpp
@@ -21,6 +21,7 @@
#include "src/gpu/ganesh/GrGeometryProcessor.h"
#include "src/gpu/ganesh/GrProcessor.h"
#include "src/gpu/ganesh/GrProgramInfo.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/geometry/GrPathUtils.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -30,7 +31,6 @@
#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h"
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
namespace skgpu::v1 {
diff --git a/src/gpu/ganesh/ops/AAConvexPathRenderer.h b/src/gpu/ganesh/ops/AAConvexPathRenderer.h
index 0d1a33b..42642d3 100644
--- a/src/gpu/ganesh/ops/AAConvexPathRenderer.h
+++ b/src/gpu/ganesh/ops/AAConvexPathRenderer.h
@@ -8,7 +8,7 @@
#ifndef AAConvexPathRenderer_DEFINED
#define AAConvexPathRenderer_DEFINED
-#include "src/gpu/ganesh/v1/PathRenderer.h"
+#include "src/gpu/ganesh/PathRenderer.h"
namespace skgpu::v1 {
diff --git a/src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp b/src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp
index 93051fb..af8d108 100644
--- a/src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp
+++ b/src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp
@@ -25,12 +25,12 @@
#include "src/gpu/ganesh/GrResourceProvider.h"
#include "src/gpu/ganesh/GrStyle.h"
#include "src/gpu/ganesh/GrUtil.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrBezierEffect.h"
#include "src/gpu/ganesh/geometry/GrPathUtils.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#define PREALLOC_PTARRAY(N) SkSTArray<(N),SkPoint, true>
@@ -1347,4 +1347,3 @@
}
} // namespace skgpu::v1
-
diff --git a/src/gpu/ganesh/ops/AAHairLinePathRenderer.h b/src/gpu/ganesh/ops/AAHairLinePathRenderer.h
index 7019035..1b4afc0 100644
--- a/src/gpu/ganesh/ops/AAHairLinePathRenderer.h
+++ b/src/gpu/ganesh/ops/AAHairLinePathRenderer.h
@@ -8,7 +8,7 @@
#ifndef AAHairLinePathRenderer_DEFINED
#define AAHairLinePathRenderer_DEFINED
-#include "src/gpu/ganesh/v1/PathRenderer.h"
+#include "src/gpu/ganesh/PathRenderer.h"
namespace skgpu::v1 {
diff --git a/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.cpp b/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.cpp
index ad55a39..2644a5b 100644
--- a/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.cpp
@@ -21,12 +21,12 @@
#include "src/gpu/ganesh/GrProcessor.h"
#include "src/gpu/ganesh/GrProgramInfo.h"
#include "src/gpu/ganesh/GrStyle.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/geometry/GrAAConvexTessellator.h"
#include "src/gpu/ganesh/geometry/GrPathUtils.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
///////////////////////////////////////////////////////////////////////////////
namespace skgpu::v1 {
diff --git a/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.h b/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.h
index fc2e877..127f8e0 100644
--- a/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.h
+++ b/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.h
@@ -8,7 +8,7 @@
#ifndef AALinearizingConvexPathRenderer_DEFINED
#define AALinearizingConvexPathRenderer_DEFINED
-#include "src/gpu/ganesh/v1/PathRenderer.h"
+#include "src/gpu/ganesh/PathRenderer.h"
namespace skgpu::v1 {
diff --git a/src/gpu/ganesh/ops/AtlasPathRenderer.cpp b/src/gpu/ganesh/ops/AtlasPathRenderer.cpp
index 943bd29..88e9c1b 100644
--- a/src/gpu/ganesh/ops/AtlasPathRenderer.cpp
+++ b/src/gpu/ganesh/ops/AtlasPathRenderer.cpp
@@ -11,13 +11,13 @@
#include "src/core/SkIPoint16.h"
#include "src/gpu/ganesh/GrClip.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
#include "src/gpu/ganesh/ops/AtlasRenderTask.h"
#include "src/gpu/ganesh/ops/DrawAtlasPathOp.h"
#include "src/gpu/ganesh/ops/TessellationPathRenderer.h"
#include "src/gpu/ganesh/tessellate/GrTessellationShader.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
namespace {
diff --git a/src/gpu/ganesh/ops/AtlasPathRenderer.h b/src/gpu/ganesh/ops/AtlasPathRenderer.h
index 49e4f86..f9e164a 100644
--- a/src/gpu/ganesh/ops/AtlasPathRenderer.h
+++ b/src/gpu/ganesh/ops/AtlasPathRenderer.h
@@ -14,7 +14,7 @@
#include "src/gpu/ganesh/GrDynamicAtlas.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrOnFlushResourceProvider.h"
-#include "src/gpu/ganesh/v1/PathRenderer.h"
+#include "src/gpu/ganesh/PathRenderer.h"
class GrOp;
class GrRecordingContext;
diff --git a/src/gpu/ganesh/ops/AtlasTextOp.cpp b/src/gpu/ganesh/ops/AtlasTextOp.cpp
index a2842cb..cc30172 100644
--- a/src/gpu/ganesh/ops/AtlasTextOp.cpp
+++ b/src/gpu/ganesh/ops/AtlasTextOp.cpp
@@ -20,11 +20,11 @@
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
#include "src/gpu/ganesh/GrResourceProvider.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrBitmapTextGeoProc.h"
#include "src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h"
#include "src/gpu/ganesh/text/GrAtlasManager.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "src/text/GlyphRun.h"
#include "src/text/gpu/DistanceFieldAdjustTable.h"
diff --git a/src/gpu/ganesh/ops/DashLinePathRenderer.cpp b/src/gpu/ganesh/ops/DashLinePathRenderer.cpp
index c460186..29d1649 100644
--- a/src/gpu/ganesh/ops/DashLinePathRenderer.cpp
+++ b/src/gpu/ganesh/ops/DashLinePathRenderer.cpp
@@ -9,10 +9,10 @@
#include "src/gpu/ganesh/GrAuditTrail.h"
#include "src/gpu/ganesh/GrGpu.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
#include "src/gpu/ganesh/ops/DashOp.h"
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
namespace skgpu::v1 {
diff --git a/src/gpu/ganesh/ops/DashLinePathRenderer.h b/src/gpu/ganesh/ops/DashLinePathRenderer.h
index 67dc342..4f45ed9 100644
--- a/src/gpu/ganesh/ops/DashLinePathRenderer.h
+++ b/src/gpu/ganesh/ops/DashLinePathRenderer.h
@@ -8,7 +8,7 @@
#ifndef DashLinePathRenderer_DEFINED
#define DashLinePathRenderer_DEFINED
-#include "src/gpu/ganesh/v1/PathRenderer.h"
+#include "src/gpu/ganesh/PathRenderer.h"
class GrGpu;
diff --git a/src/gpu/ganesh/ops/DefaultPathRenderer.cpp b/src/gpu/ganesh/ops/DefaultPathRenderer.cpp
index 924cb99..232051c 100644
--- a/src/gpu/ganesh/ops/DefaultPathRenderer.cpp
+++ b/src/gpu/ganesh/ops/DefaultPathRenderer.cpp
@@ -23,13 +23,13 @@
#include "src/gpu/ganesh/GrSimpleMesh.h"
#include "src/gpu/ganesh/GrStyle.h"
#include "src/gpu/ganesh/GrUtil.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrDisableColorXP.h"
#include "src/gpu/ganesh/geometry/GrPathUtils.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
#include "src/gpu/ganesh/ops/GrPathStencilSettings.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
////////////////////////////////////////////////////////////////////////////////
// Helpers for drawPath
diff --git a/src/gpu/ganesh/ops/DefaultPathRenderer.h b/src/gpu/ganesh/ops/DefaultPathRenderer.h
index 5294efb..e487206 100644
--- a/src/gpu/ganesh/ops/DefaultPathRenderer.h
+++ b/src/gpu/ganesh/ops/DefaultPathRenderer.h
@@ -8,7 +8,7 @@
#ifndef DefaultPathRenderer_DEFINED
#define DefaultPathRenderer_DEFINED
-#include "src/gpu/ganesh/v1/PathRenderer.h"
+#include "src/gpu/ganesh/PathRenderer.h"
namespace skgpu::v1 {
diff --git a/src/gpu/ganesh/ops/FillRectOp.cpp b/src/gpu/ganesh/ops/FillRectOp.cpp
index e15c810..e9e0e8e 100644
--- a/src/gpu/ganesh/ops/FillRectOp.cpp
+++ b/src/gpu/ganesh/ops/FillRectOp.cpp
@@ -15,6 +15,7 @@
#include "src/gpu/ganesh/GrPaint.h"
#include "src/gpu/ganesh/GrProgramInfo.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/geometry/GrQuad.h"
#include "src/gpu/ganesh/geometry/GrQuadBuffer.h"
#include "src/gpu/ganesh/geometry/GrQuadUtils.h"
@@ -23,7 +24,6 @@
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h"
#include "src/gpu/ganesh/ops/QuadPerEdgeAA.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
namespace {
diff --git a/src/gpu/ganesh/ops/SmallPathRenderer.cpp b/src/gpu/ganesh/ops/SmallPathRenderer.cpp
index b54b6b2..272f95a 100644
--- a/src/gpu/ganesh/ops/SmallPathRenderer.cpp
+++ b/src/gpu/ganesh/ops/SmallPathRenderer.cpp
@@ -22,6 +22,7 @@
#include "src/gpu/ganesh/GrDistanceFieldGenFromVector.h"
#include "src/gpu/ganesh/GrDrawOpTest.h"
#include "src/gpu/ganesh/GrResourceProvider.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrBitmapTextGeoProc.h"
#include "src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h"
#include "src/gpu/ganesh/geometry/GrQuad.h"
@@ -30,7 +31,6 @@
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h"
#include "src/gpu/ganesh/ops/SmallPathAtlasMgr.h"
#include "src/gpu/ganesh/ops/SmallPathShapeData.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
using MaskFormat = skgpu::MaskFormat;
diff --git a/src/gpu/ganesh/ops/SmallPathRenderer.h b/src/gpu/ganesh/ops/SmallPathRenderer.h
index bc18e15..cc9e7a7 100644
--- a/src/gpu/ganesh/ops/SmallPathRenderer.h
+++ b/src/gpu/ganesh/ops/SmallPathRenderer.h
@@ -8,7 +8,7 @@
#ifndef SmallPathRenderer_DEFINED
#define SmallPathRenderer_DEFINED
-#include "src/gpu/ganesh/v1/PathRenderer.h"
+#include "src/gpu/ganesh/PathRenderer.h"
class GrStyledShape;
diff --git a/src/gpu/ganesh/ops/SoftwarePathRenderer.cpp b/src/gpu/ganesh/ops/SoftwarePathRenderer.cpp
index 8e19f4d..49524f1 100644
--- a/src/gpu/ganesh/ops/SoftwarePathRenderer.cpp
+++ b/src/gpu/ganesh/ops/SoftwarePathRenderer.cpp
@@ -23,10 +23,10 @@
#include "src/gpu/ganesh/GrSWMaskHelper.h"
#include "src/gpu/ganesh/GrUtil.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
namespace {
diff --git a/src/gpu/ganesh/ops/SoftwarePathRenderer.h b/src/gpu/ganesh/ops/SoftwarePathRenderer.h
index b4a9be4..3cea210 100644
--- a/src/gpu/ganesh/ops/SoftwarePathRenderer.h
+++ b/src/gpu/ganesh/ops/SoftwarePathRenderer.h
@@ -9,7 +9,7 @@
#define SoftwarePathRenderer_DEFINED
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
-#include "src/gpu/ganesh/v1/PathRenderer.h"
+#include "src/gpu/ganesh/PathRenderer.h"
class GrProxyProvider;
diff --git a/src/gpu/ganesh/ops/TessellationPathRenderer.cpp b/src/gpu/ganesh/ops/TessellationPathRenderer.cpp
index 94a2fae..d0fee1c 100644
--- a/src/gpu/ganesh/ops/TessellationPathRenderer.cpp
+++ b/src/gpu/ganesh/ops/TessellationPathRenderer.cpp
@@ -11,13 +11,13 @@
#include "src/gpu/ganesh/GrClip.h"
#include "src/gpu/ganesh/GrMemoryPool.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrDisableColorXP.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
#include "src/gpu/ganesh/ops/PathInnerTriangulateOp.h"
#include "src/gpu/ganesh/ops/PathStencilCoverOp.h"
#include "src/gpu/ganesh/ops/PathTessellateOp.h"
#include "src/gpu/ganesh/ops/StrokeTessellateOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "src/gpu/tessellate/Tessellation.h"
#include "src/gpu/tessellate/WangsFormula.h"
diff --git a/src/gpu/ganesh/ops/TessellationPathRenderer.h b/src/gpu/ganesh/ops/TessellationPathRenderer.h
index 2e5bb4c..583b09a 100644
--- a/src/gpu/ganesh/ops/TessellationPathRenderer.h
+++ b/src/gpu/ganesh/ops/TessellationPathRenderer.h
@@ -9,7 +9,7 @@
#define TessellationPathRenderer_DEFINED
#include "include/gpu/GrTypes.h"
-#include "src/gpu/ganesh/v1/PathRenderer.h"
+#include "src/gpu/ganesh/PathRenderer.h"
class GrCaps;
diff --git a/src/gpu/ganesh/ops/TextureOp.cpp b/src/gpu/ganesh/ops/TextureOp.cpp
index 7910425..5c5f711 100644
--- a/src/gpu/ganesh/ops/TextureOp.cpp
+++ b/src/gpu/ganesh/ops/TextureOp.cpp
@@ -30,6 +30,7 @@
#include "src/gpu/ganesh/GrTexture.h"
#include "src/gpu/ganesh/GrTextureProxy.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
#include "src/gpu/ganesh/geometry/GrQuad.h"
@@ -42,7 +43,6 @@
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h"
#include "src/gpu/ganesh/ops/QuadPerEdgeAA.h"
#include "src/gpu/ganesh/ops/TextureOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
namespace {
diff --git a/src/gpu/ganesh/ops/TriangulatingPathRenderer.cpp b/src/gpu/ganesh/ops/TriangulatingPathRenderer.cpp
index 48e8807..d569d1c 100644
--- a/src/gpu/ganesh/ops/TriangulatingPathRenderer.cpp
+++ b/src/gpu/ganesh/ops/TriangulatingPathRenderer.cpp
@@ -22,13 +22,13 @@
#include "src/gpu/ganesh/GrSimpleMesh.h"
#include "src/gpu/ganesh/GrStyle.h"
#include "src/gpu/ganesh/GrThreadSafeCache.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/geometry/GrAATriangulator.h"
#include "src/gpu/ganesh/geometry/GrPathUtils.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
#include "src/gpu/ganesh/geometry/GrTriangulator.h"
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include <cstdio>
diff --git a/src/gpu/ganesh/ops/TriangulatingPathRenderer.h b/src/gpu/ganesh/ops/TriangulatingPathRenderer.h
index d53e731..b06359d 100644
--- a/src/gpu/ganesh/ops/TriangulatingPathRenderer.h
+++ b/src/gpu/ganesh/ops/TriangulatingPathRenderer.h
@@ -8,7 +8,7 @@
#ifndef TriangulatingPathRenderer_DEFINED
#define TriangulatingPathRenderer_DEFINED
-#include "src/gpu/ganesh/v1/PathRenderer.h"
+#include "src/gpu/ganesh/PathRenderer.h"
namespace skgpu::v1 {
diff --git a/src/gpu/ganesh/v1/BUILD.bazel b/src/gpu/ganesh/v1/BUILD.bazel
deleted file mode 100644
index d97dc71..0000000
--- a/src/gpu/ganesh/v1/BUILD.bazel
+++ /dev/null
@@ -1,41 +0,0 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "split_srcs_and_hdrs")
-
-licenses(["notice"])
-
-exports_files_legacy()
-
-V1_FILES = [
- "ClipStack.cpp",
- "ClipStack.h",
- "Device.cpp",
- "Device_drawTexture.cpp",
- "Device_v1.h",
- "PathRenderer.cpp",
- "PathRenderer.h",
- "PathRendererChain.cpp",
- "PathRendererChain.h",
- "StencilClip.h",
- "StencilMaskHelper.cpp",
- "StencilMaskHelper.h",
- "SurfaceDrawContext.cpp",
- "SurfaceDrawContext_v1.h",
- "SurfaceFillContext_v1.cpp",
- "SurfaceFillContext_v1.h",
-]
-
-split_srcs_and_hdrs(
- name = "v1",
- files = V1_FILES,
-)
-
-filegroup(
- name = "srcs",
- srcs = [":v1_srcs"],
- visibility = ["//src/gpu/ganesh:__pkg__"],
-)
-
-filegroup(
- name = "private_hdrs",
- srcs = [":v1_hdrs"],
- visibility = ["//src/gpu/ganesh:__pkg__"],
-)
diff --git a/src/image/SkSurface_GpuMtl.mm b/src/image/SkSurface_GpuMtl.mm
index 29d2093..b38f4dc 100644
--- a/src/image/SkSurface_GpuMtl.mm
+++ b/src/image/SkSurface_GpuMtl.mm
@@ -13,7 +13,7 @@
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
#include "src/gpu/ganesh/GrResourceProvider.h"
#include "src/gpu/ganesh/GrResourceProviderPriv.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/image/SkSurface_Gpu.h"
#if SK_SUPPORT_GPU
diff --git a/src/text/gpu/SubRunContainer.cpp b/src/text/gpu/SubRunContainer.cpp
index 61b7e93..e404356 100644
--- a/src/text/gpu/SubRunContainer.cpp
+++ b/src/text/gpu/SubRunContainer.cpp
@@ -31,8 +31,8 @@
#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"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
using AtlasTextOp = skgpu::v1::AtlasTextOp;
#endif // SK_SUPPORT_GPU
diff --git a/src/text/gpu/TextBlob.cpp b/src/text/gpu/TextBlob.cpp
index b9b8b47..bec2861 100644
--- a/src/text/gpu/TextBlob.cpp
+++ b/src/text/gpu/TextBlob.cpp
@@ -36,9 +36,9 @@
#include "src/text/gpu/SubRunContainer.h"
#if SK_SUPPORT_GPU // Ganesh Support
+#include "src/gpu/ganesh/Device_v1.h"
#include "src/gpu/ganesh/GrClip.h"
-#include "src/gpu/ganesh/v1/Device_v1.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#endif
using namespace sktext::gpu;
diff --git a/src/text/gpu/TextBlobRedrawCoordinator.cpp b/src/text/gpu/TextBlobRedrawCoordinator.cpp
index d8775c7..c3d5ff3 100644
--- a/src/text/gpu/TextBlobRedrawCoordinator.cpp
+++ b/src/text/gpu/TextBlobRedrawCoordinator.cpp
@@ -10,7 +10,7 @@
#include "src/core/SkStrikeCache.h"
#include "src/text/GlyphRun.h"
#if SK_SUPPORT_GPU
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#endif
// This needs to be outside the namespace so we can declare SkMessageBus properly
diff --git a/tests/BulkRectTest.cpp b/tests/BulkRectTest.cpp
index 55942cd..d06c006 100644
--- a/tests/BulkRectTest.cpp
+++ b/tests/BulkRectTest.cpp
@@ -12,9 +12,9 @@
#include "src/gpu/ganesh/GrOpsTypes.h"
#include "src/gpu/ganesh/GrProxyProvider.h"
#include "src/gpu/ganesh/GrResourceProvider.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/ops/FillRectOp.h"
#include "src/gpu/ganesh/ops/TextureOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tests/Test.h"
static std::unique_ptr<skgpu::v1::SurfaceDrawContext> new_SDC(GrRecordingContext* rContext) {
diff --git a/tests/ClearTest.cpp b/tests/ClearTest.cpp
index c88d445..34f2898 100644
--- a/tests/ClearTest.cpp
+++ b/tests/ClearTest.cpp
@@ -23,8 +23,8 @@
#include "src/gpu/ganesh/GrColor.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "src/gpu/ganesh/GrImageInfo.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/ops/ClearOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tests/Test.h"
#include "tools/gpu/GrContextFactory.h"
diff --git a/tests/DMSAATest.cpp b/tests/DMSAATest.cpp
index 6419641..6cfd05f 100644
--- a/tests/DMSAATest.cpp
+++ b/tests/DMSAATest.cpp
@@ -14,7 +14,7 @@
#include "src/core/SkMatrixProvider.h"
#include "src/core/SkSurfacePriv.h"
#include "src/gpu/ganesh/GrStyle.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
namespace {
diff --git a/tests/DefaultPathRendererTest.cpp b/tests/DefaultPathRendererTest.cpp
index dc93061..49e942f 100644
--- a/tests/DefaultPathRendererTest.cpp
+++ b/tests/DefaultPathRendererTest.cpp
@@ -28,7 +28,7 @@
#include "src/gpu/ganesh/GrImageInfo.h"
#include "src/gpu/ganesh/GrPaint.h"
#include "src/gpu/ganesh/GrStyle.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "tests/Test.h"
#include "tools/gpu/GrContextFactory.h"
diff --git a/tests/DrawOpAtlasTest.cpp b/tests/DrawOpAtlasTest.cpp
index d5f3698..00369c2 100644
--- a/tests/DrawOpAtlasTest.cpp
+++ b/tests/DrawOpAtlasTest.cpp
@@ -195,7 +195,7 @@
}
#if SK_GPU_V1
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
// This test verifies that the AtlasTextOp::onPrepare method correctly handles a failure
// when allocating an atlas page.
diff --git a/tests/GrClipStackTest.cpp b/tests/GrClipStackTest.cpp
index e56d060..339b6c5 100644
--- a/tests/GrClipStackTest.cpp
+++ b/tests/GrClipStackTest.cpp
@@ -6,7 +6,7 @@
* found in the LICENSE file.
*/
-#include "src/gpu/ganesh/v1/ClipStack.h"
+#include "src/gpu/ganesh/ClipStack.h"
#include "tests/Test.h"
#include "include/core/SkColorSpace.h"
@@ -21,8 +21,8 @@
#include "src/core/SkRectPriv.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "src/gpu/ganesh/GrProxyProvider.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
namespace {
diff --git a/tests/GrGpuBufferTest.cpp b/tests/GrGpuBufferTest.cpp
index 1c5efd3..1cd5a7c 100644
--- a/tests/GrGpuBufferTest.cpp
+++ b/tests/GrGpuBufferTest.cpp
@@ -11,10 +11,10 @@
#include "src/gpu/ganesh/GrGpu.h"
#include "src/gpu/ganesh/GrGpuBuffer.h"
#include "src/gpu/ganesh/GrResourceProvider.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tests/Test.h"
#include "tools/gpu/GrContextFactory.h"
diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index 2fbf15f..1e881d8 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp
@@ -22,11 +22,11 @@
#include "src/gpu/ganesh/GrOpsRenderPass.h"
#include "src/gpu/ganesh/GrProgramInfo.h"
#include "src/gpu/ganesh/GrResourceProvider.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLVarying.h"
#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include <array>
#include <memory>
diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp
index ac7a16b..394cbf8 100644
--- a/tests/GrMipMappedTest.cpp
+++ b/tests/GrMipMappedTest.cpp
@@ -25,7 +25,7 @@
#include "src/gpu/ganesh/GrSurfaceProxyPriv.h"
#include "src/gpu/ganesh/GrTexture.h"
#include "src/gpu/ganesh/GrTextureProxy.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/image/SkImage_Base.h"
#include "src/image/SkSurface_Gpu.h"
#include "tests/Test.h"
diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp
index def61f2..f8f5da6 100644
--- a/tests/GrPipelineDynamicStateTest.cpp
+++ b/tests/GrPipelineDynamicStateTest.cpp
@@ -21,11 +21,11 @@
#include "src/gpu/ganesh/GrProgramInfo.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
#include "src/gpu/ganesh/GrResourceProvider.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLVarying.h"
#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
/**
* This is a GPU-backend specific test for dynamic pipeline state. It draws boxes using dynamic
diff --git a/tests/GrThreadSafeCacheTest.cpp b/tests/GrThreadSafeCacheTest.cpp
index 1cb3b30..001f4de 100644
--- a/tests/GrThreadSafeCacheTest.cpp
+++ b/tests/GrThreadSafeCacheTest.cpp
@@ -22,8 +22,8 @@
#include "src/gpu/ganesh/GrResourceProvider.h"
#include "src/gpu/ganesh/GrStyle.h"
#include "src/gpu/ganesh/GrThreadSafeCache.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tests/Test.h"
#include "tests/TestUtils.h"
#include "tools/gpu/ProxyUtils.h"
diff --git a/tests/LazyProxyTest.cpp b/tests/LazyProxyTest.cpp
index 165600a..b6462520 100644
--- a/tests/LazyProxyTest.cpp
+++ b/tests/LazyProxyTest.cpp
@@ -22,10 +22,10 @@
#include "src/gpu/ganesh/GrTexture.h"
#include "src/gpu/ganesh/GrTextureProxy.h"
#include "src/gpu/ganesh/GrTextureProxyPriv.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
#include "src/gpu/ganesh/mock/GrMockGpu.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
// This test verifies that lazy proxy callbacks get invoked during flush, after onFlush callbacks,
// but before Ops are executed. It also ensures that lazy proxy callbacks are invoked both for
diff --git a/tests/PathRendererCacheTests.cpp b/tests/PathRendererCacheTests.cpp
index 58f2fbc..0611cb3 100644
--- a/tests/PathRendererCacheTests.cpp
+++ b/tests/PathRendererCacheTests.cpp
@@ -16,11 +16,11 @@
#include "src/gpu/ganesh/GrResourceCache.h"
#include "src/gpu/ganesh/GrStyle.h"
#include "src/gpu/ganesh/GrUserStencilSettings.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h"
#include "src/gpu/ganesh/geometry/GrStyledShape.h"
#include "src/gpu/ganesh/ops/SoftwarePathRenderer.h"
#include "src/gpu/ganesh/ops/TriangulatingPathRenderer.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
static SkPath create_concave_path() {
SkPath path;
diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp
index 414c7d9..cfe04eb 100644
--- a/tests/PrimitiveProcessorTest.cpp
+++ b/tests/PrimitiveProcessorTest.cpp
@@ -20,11 +20,11 @@
#include "src/gpu/ganesh/GrMemoryPool.h"
#include "src/gpu/ganesh/GrOpFlushState.h"
#include "src/gpu/ganesh/GrProgramInfo.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLVarying.h"
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tests/Test.h"
#include <memory>
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index e0f22d5..eb098cd 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -19,10 +19,10 @@
#include "src/gpu/ganesh/GrProxyProvider.h"
#include "src/gpu/ganesh/GrResourceProvider.h"
#include "src/gpu/ganesh/SkGr.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tests/TestHarness.h"
#include "tests/TestUtils.h"
diff --git a/tests/ProgramsTest.cpp b/tests/ProgramsTest.cpp
index 256654f..94a7894 100644
--- a/tests/ProgramsTest.cpp
+++ b/tests/ProgramsTest.cpp
@@ -22,12 +22,12 @@
#include "src/gpu/ganesh/GrPipeline.h"
#include "src/gpu/ganesh/GrProxyProvider.h"
#include "src/gpu/ganesh/GrXferProcessor.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h"
#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tests/Test.h"
#include "tools/gpu/GrContextFactory.h"
diff --git a/tests/SkSLCross.cpp b/tests/SkSLCross.cpp
index a6469da..7cd3774 100644
--- a/tests/SkSLCross.cpp
+++ b/tests/SkSLCross.cpp
@@ -25,10 +25,10 @@
#include "src/gpu/ganesh/GrPaint.h"
#include "src/gpu/ganesh/GrPixmap.h"
#include "src/gpu/ganesh/GrProcessor.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h"
#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
#include "tests/Test.h"
#include "tools/gpu/GrContextFactory.h"
diff --git a/tests/SurfaceDrawContextTest.cpp b/tests/SurfaceDrawContextTest.cpp
index 9783992..ca5792e 100644
--- a/tests/SurfaceDrawContextTest.cpp
+++ b/tests/SurfaceDrawContextTest.cpp
@@ -14,7 +14,7 @@
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "src/gpu/ganesh/GrImageInfo.h"
#include "src/gpu/ganesh/GrTextureProxy.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
static const int kSize = 64;
diff --git a/tests/TriangulatingPathRendererTests.cpp b/tests/TriangulatingPathRendererTests.cpp
index 1d44d35..729e698 100644
--- a/tests/TriangulatingPathRendererTests.cpp
+++ b/tests/TriangulatingPathRendererTests.cpp
@@ -488,8 +488,8 @@
};
#if SK_GPU_V1
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/ops/TriangulatingPathRenderer.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
// A simple concave path. Test this with a non-invertible matrix.
static SkPath create_path_17() {
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
index de25d26..361715e 100644
--- a/tools/gpu/GrTest.cpp
+++ b/tools/gpu/GrTest.cpp
@@ -24,7 +24,7 @@
#include "src/gpu/ganesh/GrSemaphore.h"
#include "src/gpu/ganesh/GrTexture.h"
#include "src/gpu/ganesh/SkGr.h"
-#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h"
+#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/image/SkImage_Gpu.h"
#include "src/text/gpu/StrikeCache.h"
#include "src/text/gpu/TextBlobRedrawCoordinator.h"
