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/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp
index 1a2bb2c..703e169 100644
--- a/src/gpu/text/GrTextBlob.cpp
+++ b/src/gpu/text/GrTextBlob.cpp
@@ -19,7 +19,6 @@
#include "src/gpu/GrMeshDrawTarget.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrStyle.h"
-#include "src/gpu/GrSurfaceDrawContext.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/effects/GrDistanceFieldGeoProc.h"
#include "src/gpu/geometry/GrStyledShape.h"
@@ -27,6 +26,7 @@
#include "src/gpu/text/GrAtlasManager.h"
#include "src/gpu/text/GrStrikeCache.h"
#include "src/gpu/text/GrTextBlob.h"
+#include "src/gpu/v1/SurfaceDrawContext_v1.h"
namespace {
struct AtlasPt {
@@ -71,7 +71,7 @@
SkUNREACHABLE;
}
-SkPMColor4f calculate_colors(GrSurfaceDrawContext* sdc,
+SkPMColor4f calculate_colors(skgpu::v1::SurfaceDrawContext* sdc,
const SkPaint& paint,
const SkMatrixProvider& matrix,
GrMaskFormat grMaskFormat,
@@ -175,7 +175,7 @@
const SkMatrixProvider& viewMatrix,
const SkGlyphRunList& glyphRunList,
const SkPaint& paint,
- GrSurfaceDrawContext* sdc) const override;
+ skgpu::v1::SurfaceDrawContext* sdc) const override;
bool canReuse(const SkPaint& paint, const SkMatrix& drawMatrix) const override;
@@ -214,7 +214,7 @@
const SkMatrixProvider& viewMatrix,
const SkGlyphRunList& glyphRunList,
const SkPaint& paint,
- GrSurfaceDrawContext* sdc) const {
+ skgpu::v1::SurfaceDrawContext* sdc) const {
SkASSERT(!fPaths.empty());
SkPoint drawOrigin = glyphRunList.origin();
SkPaint runPaint{paint};
@@ -448,11 +448,11 @@
GrTextBlob* blob,
GrSubRunAllocator* alloc);
- void draw(const GrClip* clip,
+ void draw(const GrClip*,
const SkMatrixProvider& viewMatrix,
- const SkGlyphRunList& glyphRunList,
- const SkPaint& paint,
- GrSurfaceDrawContext* sdc) const override;
+ const SkGlyphRunList&,
+ const SkPaint&,
+ skgpu::v1::SurfaceDrawContext*) const override;
bool canReuse(const SkPaint& paint, const SkMatrix& drawMatrix) const override;
@@ -467,7 +467,7 @@
const SkMatrixProvider& viewMatrix,
const SkGlyphRunList& glyphRunList,
const SkPaint& paint,
- GrSurfaceDrawContext* sdc,
+ skgpu::v1::SurfaceDrawContext* sdc,
GrAtlasSubRunOwner) const override;
void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
@@ -552,10 +552,11 @@
GlyphVector{strikeSpec, {glyphIDs, goodPosCount}}, glyphsExcluded);
}
-void DirectMaskSubRun::draw(const GrClip* clip, const SkMatrixProvider& viewMatrix,
+void DirectMaskSubRun::draw(const GrClip* clip,
+ const SkMatrixProvider& viewMatrix,
const SkGlyphRunList& glyphRunList,
const SkPaint& paint,
- GrSurfaceDrawContext* sdc) const{
+ skgpu::v1::SurfaceDrawContext* sdc) const{
auto[drawingClip, op] = this->makeAtlasTextOp(
clip, viewMatrix, glyphRunList, paint, sdc, nullptr);
if (op != nullptr) {
@@ -634,7 +635,7 @@
DirectMaskSubRun::makeAtlasTextOp(const GrClip* clip, const SkMatrixProvider& viewMatrix,
const SkGlyphRunList& glyphRunList,
const SkPaint& paint,
- GrSurfaceDrawContext* sdc,
+ skgpu::v1::SurfaceDrawContext* sdc,
GrAtlasSubRunOwner) const {
SkASSERT(this->glyphCount() != 0);
@@ -840,22 +841,22 @@
GrTextBlob* blob,
GrSubRunAllocator* alloc);
- void draw(const GrClip* clip,
+ void draw(const GrClip*,
const SkMatrixProvider& viewMatrix,
- const SkGlyphRunList& glyphRunList,
- const SkPaint& paint,
- GrSurfaceDrawContext* sdc) const override;
+ const SkGlyphRunList&,
+ const SkPaint&,
+ skgpu::v1::SurfaceDrawContext*) const override;
bool canReuse(const SkPaint& paint, const SkMatrix& drawMatrix) const override;
GrAtlasSubRun* testingOnly_atlasSubRun() override;
std::tuple<const GrClip*, GrOp::Owner>
- makeAtlasTextOp(const GrClip* clip,
+ makeAtlasTextOp(const GrClip*,
const SkMatrixProvider& viewMatrix,
- const SkGlyphRunList& glyphRunList,
- const SkPaint& paint,
- GrSurfaceDrawContext* sdc,
+ const SkGlyphRunList&,
+ const SkPaint&,
+ skgpu::v1::SurfaceDrawContext*,
GrAtlasSubRunOwner) const override;
void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
@@ -929,7 +930,7 @@
const SkMatrixProvider& viewMatrix,
const SkGlyphRunList& glyphRunList,
const SkPaint& paint,
- GrSurfaceDrawContext* sdc) const {
+ skgpu::v1::SurfaceDrawContext* sdc) const {
auto[drawingClip, op] = this->makeAtlasTextOp(
clip, viewMatrix, glyphRunList, paint, sdc, nullptr);
if (op != nullptr) {
@@ -951,7 +952,7 @@
const SkMatrixProvider& viewMatrix,
const SkGlyphRunList& glyphRunList,
const SkPaint& paint,
- GrSurfaceDrawContext* sdc,
+ skgpu::v1::SurfaceDrawContext* sdc,
GrAtlasSubRunOwner) const {
SkASSERT(this->glyphCount() != 0);
@@ -1095,22 +1096,22 @@
GrTextBlob* blob,
GrSubRunAllocator* alloc);
- void draw(const GrClip* clip,
+ void draw(const GrClip*,
const SkMatrixProvider& viewMatrix,
- const SkGlyphRunList& glyphRunList,
- const SkPaint& paint,
- GrSurfaceDrawContext* sdc) const override;
+ const SkGlyphRunList&,
+ const SkPaint&,
+ skgpu::v1::SurfaceDrawContext*) const override;
bool canReuse(const SkPaint& paint, const SkMatrix& drawMatrix) const override;
GrAtlasSubRun* testingOnly_atlasSubRun() override;
std::tuple<const GrClip*, GrOp::Owner>
- makeAtlasTextOp(const GrClip* clip,
+ makeAtlasTextOp(const GrClip*,
const SkMatrixProvider& viewMatrix,
- const SkGlyphRunList& glyphRunList,
- const SkPaint& paint,
- GrSurfaceDrawContext* sdc,
+ const SkGlyphRunList&,
+ const SkPaint&,
+ skgpu::v1::SurfaceDrawContext*,
GrAtlasSubRunOwner) const override;
void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
@@ -1197,7 +1198,7 @@
}
static std::tuple<GrAtlasTextOp::MaskType, uint32_t, bool> calculate_sdf_parameters(
- const GrSurfaceDrawContext& sdc,
+ const skgpu::v1::SurfaceDrawContext& sdc,
const SkMatrix& drawMatrix,
bool useLCDText,
bool isAntiAliased) {
@@ -1229,7 +1230,7 @@
const SkMatrixProvider& viewMatrix,
const SkGlyphRunList& glyphRunList,
const SkPaint& paint,
- GrSurfaceDrawContext* sdc,
+ skgpu::v1::SurfaceDrawContext* sdc,
GrAtlasSubRunOwner) const {
SkASSERT(this->glyphCount() != 0);
SkASSERT(!viewMatrix.localToDevice().hasPerspective());
@@ -1272,7 +1273,7 @@
const SkMatrixProvider& viewMatrix,
const SkGlyphRunList& glyphRunList,
const SkPaint& paint,
- GrSurfaceDrawContext* sdc) const {
+ skgpu::v1::SurfaceDrawContext* sdc) const {
auto[drawingClip, op] = this->makeAtlasTextOp(
clip, viewMatrix, glyphRunList, paint, sdc, nullptr);
if (op != nullptr) {
@@ -1651,12 +1652,12 @@
int glyphCount() const override;
std::tuple<const GrClip*, GrOp::Owner>
- makeAtlasTextOp(const GrClip* clip,
+ makeAtlasTextOp(const GrClip*,
const SkMatrixProvider& viewMatrix,
- const SkGlyphRunList& glyphRunList,
- const SkPaint& paint,
- GrSurfaceDrawContext* sdc,
- GrAtlasSubRunOwner subRunOwner) const override;
+ const SkGlyphRunList&,
+ const SkPaint&,
+ skgpu::v1::SurfaceDrawContext*,
+ GrAtlasSubRunOwner) const override;
void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
@@ -1750,7 +1751,7 @@
const SkMatrixProvider& viewMatrix,
const SkGlyphRunList& glyphRunList,
const SkPaint& paint,
- GrSurfaceDrawContext* sdc,
+ skgpu::v1::SurfaceDrawContext* sdc,
GrAtlasSubRunOwner subRunOwner) const {
SkASSERT(this->glyphCount() != 0);
@@ -1886,12 +1887,12 @@
GrSubRunAllocator* alloc);
std::tuple<const GrClip*, GrOp::Owner>
- makeAtlasTextOp(const GrClip* clip,
+ makeAtlasTextOp(const GrClip*,
const SkMatrixProvider& viewMatrix,
- const SkGlyphRunList& glyphRunList,
- const SkPaint& paint,
- GrSurfaceDrawContext* sdc,
- GrAtlasSubRunOwner subRunOwner) const override;
+ const SkGlyphRunList&,
+ const SkPaint&,
+ skgpu::v1::SurfaceDrawContext*,
+ GrAtlasSubRunOwner) const override;
void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
@@ -1963,7 +1964,7 @@
const SkMatrixProvider& viewMatrix,
const SkGlyphRunList& glyphRunList,
const SkPaint& paint,
- GrSurfaceDrawContext* sdc,
+ skgpu::v1::SurfaceDrawContext* sdc,
GrAtlasSubRunOwner subRunOwner) const {
SkASSERT(this->glyphCount() != 0);
@@ -2107,12 +2108,12 @@
GrSubRunAllocator* alloc);
std::tuple<const GrClip*, GrOp::Owner>
- makeAtlasTextOp(const GrClip* clip,
+ makeAtlasTextOp(const GrClip*,
const SkMatrixProvider& viewMatrix,
- const SkGlyphRunList& glyphRunList,
- const SkPaint& paint,
- GrSurfaceDrawContext* sdc,
- GrAtlasSubRunOwner subRunOwner) const override;
+ const SkGlyphRunList&,
+ const SkPaint&,
+ skgpu::v1::SurfaceDrawContext*,
+ GrAtlasSubRunOwner) const override;
void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
@@ -2197,7 +2198,7 @@
const SkMatrixProvider& viewMatrix,
const SkGlyphRunList& glyphRunList,
const SkPaint& paint,
- GrSurfaceDrawContext* sdc,
+ skgpu::v1::SurfaceDrawContext* sdc,
GrAtlasSubRunOwner subRunOwner) const {
SkASSERT(this->glyphCount() != 0);
@@ -2277,7 +2278,7 @@
} // namespace
-GrSubRunNoCachePainter::GrSubRunNoCachePainter(GrSurfaceDrawContext* sdc,
+GrSubRunNoCachePainter::GrSubRunNoCachePainter(skgpu::v1::SurfaceDrawContext* sdc,
GrSubRunAllocator* alloc,
const GrClip* clip,
const SkMatrixProvider& viewMatrix,