Rename GrSurfaceDrawContext to skgpu::v1::SurfaceDrawContext
This CL is mostly mechanical. It:
replaces "src/gpu/GrSurfaceDrawContext.h" #includes with
"src/gpu/v1/SurfaceDrawContext_v1.h" and reorders
replaces "class GrSurfaceDrawContext;" with
"namespace skgpu { namespace v1 { class SurfaceDrawContext; }}"
replaces "GrSurfaceDrawContext*" with "auto" where possible
replaces "rtc" with "sdc"
replaces "surfaceDrawContext" with "sdc"
replaces GrSurfaceDrawContext with skgpu::v1::SurfaceDrawContext
reflows parameters as needed
This CL does not try to:
make skgpu::v1::SurfaceDrawContext V1-only
minimize the skgpu and/or skgpu::v1 prefixes
Those two tasks will be accomplished in follow up CLs. This CL is just trying to get the bulk of the mechanical changes comprehensibly landed.
Bug: skia:11837
Change-Id: I6fe59080249d585df8f5d27c6b67569cdc35842f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/433156
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
diff --git a/src/gpu/GrSoftwarePathRenderer.h b/src/gpu/GrSoftwarePathRenderer.h
index 4f55048..a9752b0 100644
--- a/src/gpu/GrSoftwarePathRenderer.h
+++ b/src/gpu/GrSoftwarePathRenderer.h
@@ -26,26 +26,26 @@
, fAllowCaching(allowCaching) {
}
- static bool GetShapeAndClipBounds(GrSurfaceDrawContext*,
- const GrClip* clip,
- const GrStyledShape& shape,
- const SkMatrix& matrix,
+ static bool GetShapeAndClipBounds(skgpu::v1::SurfaceDrawContext*,
+ const GrClip*,
+ const GrStyledShape&,
+ const SkMatrix& viewMatrix,
SkIRect* unclippedDevShapeBounds,
SkIRect* clippedDevShapeBounds,
SkIRect* devClipBounds);
private:
- static void DrawNonAARect(GrSurfaceDrawContext* surfaceDrawContext,
- GrPaint&& paint,
- const GrUserStencilSettings& userStencilSettings,
- const GrClip* clip,
+ static void DrawNonAARect(skgpu::v1::SurfaceDrawContext*,
+ GrPaint&&,
+ const GrUserStencilSettings&,
+ const GrClip*,
const SkMatrix& viewMatrix,
const SkRect& rect,
const SkMatrix& localMatrix);
- static void DrawAroundInvPath(GrSurfaceDrawContext* surfaceDrawContext,
- GrPaint&& paint,
- const GrUserStencilSettings& userStencilSettings,
- const GrClip* clip,
+ static void DrawAroundInvPath(skgpu::v1::SurfaceDrawContext*,
+ GrPaint&&,
+ const GrUserStencilSettings&,
+ const GrClip*,
const SkMatrix& viewMatrix,
const SkIRect& devClipBounds,
const SkIRect& devPathBounds);
@@ -54,10 +54,10 @@
// space. The 'viewMatrix' will be used to ensure the correct local coords are provided to
// any fragment processors in the paint.
static void DrawToTargetWithShapeMask(GrSurfaceProxyView,
- GrSurfaceDrawContext* surfaceDrawContext,
- GrPaint&& paint,
- const GrUserStencilSettings& userStencilSettings,
- const GrClip* clip,
+ skgpu::v1::SurfaceDrawContext*,
+ GrPaint&&,
+ const GrUserStencilSettings&,
+ const GrClip*,
const SkMatrix& viewMatrix,
const SkIPoint& textureOriginInDeviceSpace,
const SkIRect& deviceSpaceRectToDraw);