src/gpu/GrOvalRenderer.cpp - Issue 1275083002: Don't pass pipeline to GrBatch::generateGeometry()

Unified Diff: src/gpu/GrOvalRenderer.cpp

Issue 1275083002: Don't pass pipeline to GrBatch::generateGeometry() (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/gpu/GrOvalRenderer.cpp

diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp

index c71040804092d378292aabbd6fbe9331ceeeaeb6..02009d7531cc91b8f87a52fa9526cfeba9d83d8f 100644

--- a/src/gpu/GrOvalRenderer.cpp

+++ b/src/gpu/GrOvalRenderer.cpp

@@ -664,7 +664,7 @@ public:

fBatch.fCoverageIgnored = !init.readsCoverage();

}

- void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {

+ void generateGeometry(GrBatchTarget* batchTarget) override {

SkMatrix invert;

if (!this->viewMatrix().invert(&invert)) {

return;

@@ -676,7 +676,7 @@ public:

invert,

this->usesLocalCoords()));

- batchTarget->initDraw(gp, pipeline);

+ batchTarget->initDraw(gp, this->pipeline());

int instanceCount = fGeoData.count();

size_t vertexStride = gp->getVertexStride();

@@ -882,7 +882,7 @@ public:

fBatch.fCoverageIgnored = !init.readsCoverage();

}

- void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {

+ void generateGeometry(GrBatchTarget* batchTarget) override {

SkMatrix invert;

if (!this->viewMatrix().invert(&invert)) {

return;

@@ -894,7 +894,7 @@ public:

invert,

this->usesLocalCoords()));

- batchTarget->initDraw(gp, pipeline);

+ batchTarget->initDraw(gp, this->pipeline());

int instanceCount = fGeoData.count();

QuadHelper helper;

@@ -1149,14 +1149,14 @@ public:

fBatch.fCoverageIgnored = !init.readsCoverage();

}

- void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {

+ void generateGeometry(GrBatchTarget* batchTarget) override {

// Setup geometry processor

SkAutoTUnref<GrGeometryProcessor> gp(DIEllipseEdgeEffect::Create(this->color(),

this->viewMatrix(),

this->mode(),

this->usesLocalCoords()));

- batchTarget->initDraw(gp, pipeline);

+ batchTarget->initDraw(gp, this->pipeline());

int instanceCount = fGeoData.count();

size_t vertexStride = gp->getVertexStride();

@@ -1500,7 +1500,7 @@ public:

fBatch.fCoverageIgnored = !init.readsCoverage();

}

- void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {

+ void generateGeometry(GrBatchTarget* batchTarget) override {

// reset to device coordinates

SkMatrix invert;

if (!this->viewMatrix().invert(&invert)) {

@@ -1514,7 +1514,7 @@ public:

invert,

this->usesLocalCoords()));

- batchTarget->initDraw(gp, pipeline);

+ batchTarget->initDraw(gp, this->pipeline());

int instanceCount = fGeoData.count();

size_t vertexStride = gp->getVertexStride();

@@ -1676,7 +1676,7 @@ public:

fBatch.fCoverageIgnored = !init.readsCoverage();

}

- void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {

+ void generateGeometry(GrBatchTarget* batchTarget) override {

// reset to device coordinates

SkMatrix invert;

if (!this->viewMatrix().invert(&invert)) {

@@ -1690,7 +1690,7 @@ public:

invert,

this->usesLocalCoords()));

- batchTarget->initDraw(gp, pipeline);

+ batchTarget->initDraw(gp, this->pipeline());

int instanceCount = fGeoData.count();

size_t vertexStride = gp->getVertexStride();

« no previous file with comments | « src/gpu/GrImmediateDrawTarget.cpp ('k') | src/gpu/GrRectBatch.cpp » ('j') | no next file with comments »