aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/ops/GrSmallPathRenderer.cpp126
-rw-r--r--src/gpu/ops/GrSmallPathRenderer.h6
2 files changed, 63 insertions, 69 deletions
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index 6112649ee6..a43790e4f2 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -16,13 +16,13 @@
#include "GrPipelineBuilder.h"
#include "GrResourceProvider.h"
#include "GrSWMaskHelper.h"
-#include "effects/GrBitmapTextGeoProc.h"
-#include "effects/GrDistanceFieldGeoProc.h"
-#include "ops/GrMeshDrawOp.h"
-
+#include "GrSimpleMeshDrawOpHelper.h"
#include "SkAutoMalloc.h"
#include "SkDistanceFieldGen.h"
#include "SkPathOps.h"
+#include "effects/GrBitmapTextGeoProc.h"
+#include "effects/GrDistanceFieldGeoProc.h"
+#include "ops/GrMeshDrawOp.h"
#define ATLAS_TEXTURE_WIDTH 2048
#define ATLAS_TEXTURE_HEIGHT 2048
@@ -130,7 +130,10 @@ bool GrSmallPathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
// padding around path bounds to allow for antialiased pixels
static const SkScalar kAntiAliasPad = 1.0f;
-class SmallPathOp final : public GrLegacyMeshDrawOp {
+class GrSmallPathRenderer::SmallPathOp final : public GrMeshDrawOp {
+private:
+ using Helper = GrSimpleMeshDrawOpHelperWithStencil;
+
public:
DEFINE_OP_CLASS_ID
@@ -138,31 +141,21 @@ public:
using ShapeCache = SkTDynamicHash<ShapeData, ShapeData::Key>;
using ShapeDataList = GrSmallPathRenderer::ShapeDataList;
- static std::unique_ptr<GrLegacyMeshDrawOp> Make(GrColor color, const GrShape& shape,
- const SkMatrix& viewMatrix,
- GrDrawOpAtlas* atlas, ShapeCache* shapeCache,
- ShapeDataList* shapeList, bool gammaCorrect) {
- return std::unique_ptr<GrLegacyMeshDrawOp>(new SmallPathOp(
- color, shape, viewMatrix, atlas, shapeCache, shapeList, gammaCorrect));
+ static std::unique_ptr<GrDrawOp> Make(GrPaint&& paint, const GrShape& shape,
+ const SkMatrix& viewMatrix, GrDrawOpAtlas* atlas,
+ ShapeCache* shapeCache, ShapeDataList* shapeList,
+ bool gammaCorrect,
+ const GrUserStencilSettings* stencilSettings) {
+ return Helper::FactoryHelper<SmallPathOp>(std::move(paint), shape, viewMatrix, atlas,
+ shapeCache, shapeList, gammaCorrect,
+ stencilSettings);
}
- const char* name() const override { return "SmallPathOp"; }
-
- SkString dumpInfo() const override {
- SkString string;
- for (const auto& geo : fShapes) {
- string.appendf("Color: 0x%08x\n", geo.fColor);
- }
- string.append(DumpPipelineInfo(*this->pipeline()));
- string.append(INHERITED::dumpInfo());
- return string;
- }
-
-private:
- SmallPathOp(GrColor color, const GrShape& shape, const SkMatrix& viewMatrix,
- GrDrawOpAtlas* atlas, ShapeCache* shapeCache, ShapeDataList* shapeList,
- bool gammaCorrect)
- : INHERITED(ClassID()) {
+ SmallPathOp(Helper::MakeArgs helperArgs, GrColor color, const GrShape& shape,
+ const SkMatrix& viewMatrix, GrDrawOpAtlas* atlas, ShapeCache* shapeCache,
+ ShapeDataList* shapeList, bool gammaCorrect,
+ const GrUserStencilSettings* stencilSettings)
+ : INHERITED(ClassID()), fHelper(helperArgs, GrAAType::kCoverage, stencilSettings) {
SkASSERT(shape.hasUnstyledKey());
// Compute bounds
this->setTransformedBounds(shape.bounds(), viewMatrix, HasAABloat::kYes, IsZeroArea::kNo);
@@ -196,32 +189,41 @@ private:
}
- void getProcessorAnalysisInputs(GrProcessorAnalysisColor* color,
- GrProcessorAnalysisCoverage* coverage) const override {
- color->setToConstant(fShapes[0].fColor);
- *coverage = GrProcessorAnalysisCoverage::kSingleChannel;
+ const char* name() const override { return "SmallPathOp"; }
+
+ SkString dumpInfo() const override {
+ SkString string;
+ for (const auto& geo : fShapes) {
+ string.appendf("Color: 0x%08x\n", geo.fColor);
+ }
+ string += fHelper.dumpInfo();
+ string += INHERITED::dumpInfo();
+ return string;
}
- void applyPipelineOptimizations(const PipelineOptimizations& optimizations) override {
- optimizations.getOverrideColorIfSet(&fShapes[0].fColor);
- fUsesLocalCoords = optimizations.readsLocalCoords();
+ FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
+
+ RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
+ return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kSingleChannel,
+ &fShapes.front().fColor);
}
+private:
struct FlushInfo {
sk_sp<const GrBuffer> fVertexBuffer;
sk_sp<const GrBuffer> fIndexBuffer;
sk_sp<GrGeometryProcessor> fGeometryProcessor;
+ const GrPipeline* fPipeline;
int fVertexOffset;
int fInstancesToFlush;
};
void onPrepareDraws(Target* target) const override {
int instanceCount = fShapes.count();
-
const SkMatrix& ctm = this->viewMatrix();
FlushInfo flushInfo;
-
+ flushInfo.fPipeline = fHelper.makePipeline(target);
// Setup GrGeometryProcessor
GrDrawOpAtlas* atlas = fAtlas;
if (fUsesDistanceField) {
@@ -233,13 +235,13 @@ private:
flags |= fGammaCorrect ? kGammaCorrect_DistanceFieldEffectFlag : 0;
flushInfo.fGeometryProcessor = GrDistanceFieldPathGeoProc::Make(
- this->color(), this->viewMatrix(), atlas->getProxy(), params, flags,
- this->usesLocalCoords());
+ this->color(), this->viewMatrix(), atlas->getProxy(), params, flags,
+ fHelper.usesLocalCoords());
} else {
GrSamplerParams params(SkShader::kClamp_TileMode, GrSamplerParams::kNone_FilterMode);
SkMatrix invert;
- if (this->usesLocalCoords()) {
+ if (fHelper.usesLocalCoords()) {
if (!this->viewMatrix().invert(&invert)) {
SkDebugf("Could not invert viewmatrix\n");
return;
@@ -249,9 +251,9 @@ private:
invert.preTranslate(-fShapes[0].fTranslate.fX, -fShapes[0].fTranslate.fY);
}
- flushInfo.fGeometryProcessor = GrBitmapTextGeoProc::Make(
- this->color(), atlas->getProxy(), params, kA8_GrMaskFormat, invert,
- this->usesLocalCoords());
+ flushInfo.fGeometryProcessor =
+ GrBitmapTextGeoProc::Make(this->color(), atlas->getProxy(), params,
+ kA8_GrMaskFormat, invert, fHelper.usesLocalCoords());
}
// allocate vertices
@@ -679,7 +681,7 @@ private:
kVerticesPerQuad, flushInfo->fInstancesToFlush,
maxInstancesPerDraw);
mesh.setVertexData(flushInfo->fVertexBuffer.get(), flushInfo->fVertexOffset);
- target->draw(flushInfo->fGeometryProcessor.get(), this->pipeline(), mesh);
+ target->draw(flushInfo->fGeometryProcessor.get(), flushInfo->fPipeline, mesh);
flushInfo->fVertexOffset += kVerticesPerQuad * flushInfo->fInstancesToFlush;
flushInfo->fInstancesToFlush = 0;
}
@@ -687,13 +689,11 @@ private:
GrColor color() const { return fShapes[0].fColor; }
const SkMatrix& viewMatrix() const { return fViewMatrix; }
- bool usesLocalCoords() const { return fUsesLocalCoords; }
bool usesDistanceField() const { return fUsesDistanceField; }
bool onCombineIfPossible(GrOp* t, const GrCaps& caps) override {
SmallPathOp* that = t->cast<SmallPathOp>();
- if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
- that->bounds(), caps)) {
+ if (!fHelper.isCompatible(that->fHelper, caps, this->bounds(), that->bounds())) {
return false;
}
@@ -706,7 +706,7 @@ private:
return false;
}
- if (!this->usesDistanceField() && this->usesLocalCoords() &&
+ if (!this->usesDistanceField() && fHelper.usesLocalCoords() &&
!this->fShapes[0].fTranslate.equalsWithinTolerance(that->fShapes[0].fTranslate)) {
return false;
}
@@ -717,7 +717,6 @@ private:
}
SkMatrix fViewMatrix;
- bool fUsesLocalCoords;
bool fUsesDistanceField;
struct Entry {
@@ -727,12 +726,13 @@ private:
};
SkSTArray<1, Entry> fShapes;
+ Helper fHelper;
GrDrawOpAtlas* fAtlas;
ShapeCache* fShapeCache;
ShapeDataList* fShapeList;
bool fGammaCorrect;
- typedef GrLegacyMeshDrawOp INHERITED;
+ typedef GrMeshDrawOp INHERITED;
};
bool GrSmallPathRenderer::onDrawPath(const DrawPathArgs& args) {
@@ -754,14 +754,10 @@ bool GrSmallPathRenderer::onDrawPath(const DrawPathArgs& args) {
}
}
- std::unique_ptr<GrLegacyMeshDrawOp> op =
- SmallPathOp::Make(args.fPaint.getColor(), *args.fShape, *args.fViewMatrix, fAtlas.get(),
- &fShapeCache, &fShapeList, args.fGammaCorrect);
- GrPipelineBuilder pipelineBuilder(std::move(args.fPaint), args.fAAType);
- pipelineBuilder.setUserStencil(args.fUserStencilSettings);
-
- args.fRenderTargetContext->addLegacyMeshDrawOp(std::move(pipelineBuilder), *args.fClip,
- std::move(op));
+ std::unique_ptr<GrDrawOp> op = SmallPathOp::Make(
+ std::move(args.fPaint), *args.fShape, *args.fViewMatrix, fAtlas.get(), &fShapeCache,
+ &fShapeList, args.fGammaCorrect, args.fUserStencilSettings);
+ args.fRenderTargetContext->addDrawOp(*args.fClip, std::move(op));
return true;
}
@@ -770,10 +766,7 @@ bool GrSmallPathRenderer::onDrawPath(const DrawPathArgs& args) {
#if GR_TEST_UTILS
-struct PathTestStruct {
- typedef GrSmallPathRenderer::ShapeCache ShapeCache;
- typedef GrSmallPathRenderer::ShapeData ShapeData;
- typedef GrSmallPathRenderer::ShapeDataList ShapeDataList;
+struct GrSmallPathRenderer::PathTestStruct {
PathTestStruct() : fContextID(SK_InvalidGenID), fAtlas(nullptr) {}
~PathTestStruct() { this->reset(); }
@@ -812,7 +805,8 @@ struct PathTestStruct {
ShapeDataList fShapeList;
};
-GR_LEGACY_MESH_DRAW_OP_TEST_DEFINE(SmallPathOp) {
+GR_DRAW_OP_TEST_DEFINE(SmallPathOp) {
+ using PathTestStruct = GrSmallPathRenderer::PathTestStruct;
static PathTestStruct gTestStruct;
if (context->uniqueID() != gTestStruct.fContextID) {
@@ -826,14 +820,14 @@ GR_LEGACY_MESH_DRAW_OP_TEST_DEFINE(SmallPathOp) {
}
SkMatrix viewMatrix = GrTest::TestMatrix(random);
- GrColor color = GrRandomColor(random);
bool gammaCorrect = random->nextBool();
// This path renderer only allows fill styles.
GrShape shape(GrTest::TestPath(random), GrStyle::SimpleFill());
- return SmallPathOp::Make(color, shape, viewMatrix, gTestStruct.fAtlas.get(),
- &gTestStruct.fShapeCache, &gTestStruct.fShapeList, gammaCorrect);
+ return GrSmallPathRenderer::SmallPathOp::Make(
+ std::move(paint), shape, viewMatrix, gTestStruct.fAtlas.get(), &gTestStruct.fShapeCache,
+ &gTestStruct.fShapeList, gammaCorrect, GrGetRandomStencil(random, context));
}
#endif
diff --git a/src/gpu/ops/GrSmallPathRenderer.h b/src/gpu/ops/GrSmallPathRenderer.h
index d43da8381c..59006159f4 100644
--- a/src/gpu/ops/GrSmallPathRenderer.h
+++ b/src/gpu/ops/GrSmallPathRenderer.h
@@ -23,6 +23,9 @@ public:
GrSmallPathRenderer();
~GrSmallPathRenderer() override;
+ class SmallPathOp;
+ struct PathTestStruct;
+
private:
StencilSupport onGetStencilSupport(const GrShape&) const override {
return GrPathRenderer::kNoSupport_StencilSupport;
@@ -128,9 +131,6 @@ private:
ShapeDataList fShapeList;
typedef GrPathRenderer INHERITED;
-
- friend class SmallPathOp;
- friend struct PathTestStruct;
};
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 22:32:03 +0000