Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(319)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/gpu/GrOvalRenderer.cpp

Issue 1332923003: Remove batchtracker (Closed) Base URL: https://skia.googlesource.com/skia.git@latecreatepathprocessor
Patch Set: tweaks Created 5 years, 3 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
« no previous file with comments | « src/gpu/GrGpu.h ('k') | src/gpu/GrPathProcessor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrOvalRenderer.cpp
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index 34d3db8924e5b495389fce72fe7a2bb8a2dac918..8eed38233b699ae837859050dffb52094272db71 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -89,8 +89,7 @@ public:
class GLProcessor : public GrGLGeometryProcessor {
public:
- GLProcessor(const GrGeometryProcessor&,
- const GrBatchTracker&)
+ GLProcessor()
: fColor(GrColor_ILLEGAL) {}
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{
@@ -130,7 +129,6 @@ public:
}
static void GenKey(const GrGeometryProcessor& gp,
- const GrBatchTracker& bt,
const GrGLSLCaps&,
GrProcessorKeyBuilder* b) {
const CircleEdgeEffect& ce = gp.cast<CircleEdgeEffect>();
@@ -140,9 +138,7 @@ public:
b->add32(key);
}
- virtual void setData(const GrGLProgramDataManager& pdman,
- const GrPrimitiveProcessor& gp,
- const GrBatchTracker& bt) override {
+ void setData(const GrGLProgramDataManager& pdman, const GrPrimitiveProcessor& gp) override {
const CircleEdgeEffect& ce = gp.cast<CircleEdgeEffect>();
if (ce.color() != fColor) {
GrGLfloat c[4];
@@ -165,15 +161,12 @@ public:
typedef GrGLGeometryProcessor INHERITED;
};
- virtual void getGLProcessorKey(const GrBatchTracker& bt,
- const GrGLSLCaps& caps,
- GrProcessorKeyBuilder* b) const override {
- GLProcessor::GenKey(*this, bt, caps, b);
+ void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
+ GLProcessor::GenKey(*this, caps, b);
}
- virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
- const GrGLSLCaps&) const override {
- return new GLProcessor(*this, bt);
+ GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override {
+ return new GLProcessor();
}
private:
@@ -243,8 +236,7 @@ public:
class GLProcessor : public GrGLGeometryProcessor {
public:
- GLProcessor(const GrGeometryProcessor&,
- const GrBatchTracker&)
+ GLProcessor()
: fColor(GrColor_ILLEGAL) {}
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{
@@ -305,7 +297,6 @@ public:
}
static void GenKey(const GrGeometryProcessor& gp,
- const GrBatchTracker& bt,
const GrGLSLCaps&,
GrProcessorKeyBuilder* b) {
const EllipseEdgeEffect& ee = gp.cast<EllipseEdgeEffect>();
@@ -315,9 +306,7 @@ public:
b->add32(key);
}
- virtual void setData(const GrGLProgramDataManager& pdman,
- const GrPrimitiveProcessor& gp,
- const GrBatchTracker& bt) override {
+ void setData(const GrGLProgramDataManager& pdman, const GrPrimitiveProcessor& gp) override {
const EllipseEdgeEffect& ee = gp.cast<EllipseEdgeEffect>();
if (ee.color() != fColor) {
GrGLfloat c[4];
@@ -341,15 +330,12 @@ public:
typedef GrGLGeometryProcessor INHERITED;
};
- virtual void getGLProcessorKey(const GrBatchTracker& bt,
- const GrGLSLCaps& caps,
- GrProcessorKeyBuilder* b) const override {
- GLProcessor::GenKey(*this, bt, caps, b);
+ void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
+ GLProcessor::GenKey(*this, caps, b);
}
- virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
- const GrGLSLCaps&) const override {
- return new GLProcessor(*this, bt);
+ GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override {
+ return new GLProcessor();
}
private:
@@ -361,9 +347,9 @@ private:
this->initClassID<EllipseEdgeEffect>();
fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
fInEllipseOffset = &this->addVertexAttrib(Attribute("inEllipseOffset",
- kVec2f_GrVertexAttribType));
+ kVec2f_GrVertexAttribType));
fInEllipseRadii = &this->addVertexAttrib(Attribute("inEllipseRadii",
- kVec4f_GrVertexAttribType));
+ kVec4f_GrVertexAttribType));
fStroke = stroke;
}
@@ -425,11 +411,10 @@ public:
class GLProcessor : public GrGLGeometryProcessor {
public:
- GLProcessor(const GrGeometryProcessor&,
- const GrBatchTracker&)
+ GLProcessor()
: fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL) {}
- void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{
+ void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
const DIEllipseEdgeEffect& ee = args.fGP.cast<DIEllipseEdgeEffect>();
GrGLGPBuilder* pb = args.fPB;
GrGLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder();
@@ -502,7 +487,6 @@ public:
}
static void GenKey(const GrGeometryProcessor& gp,
- const GrBatchTracker& bt,
const GrGLSLCaps&,
GrProcessorKeyBuilder* b) {
const DIEllipseEdgeEffect& ellipseEffect = gp.cast<DIEllipseEdgeEffect>();
@@ -512,9 +496,7 @@ public:
b->add32(key);
}
- virtual void setData(const GrGLProgramDataManager& pdman,
- const GrPrimitiveProcessor& gp,
- const GrBatchTracker& bt) override {
+ void setData(const GrGLProgramDataManager& pdman, const GrPrimitiveProcessor& gp) override {
const DIEllipseEdgeEffect& dee = gp.cast<DIEllipseEdgeEffect>();
if (!dee.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(dee.viewMatrix())) {
@@ -541,15 +523,12 @@ public:
typedef GrGLGeometryProcessor INHERITED;
};
- virtual void getGLProcessorKey(const GrBatchTracker& bt,
- const GrGLSLCaps& caps,
- GrProcessorKeyBuilder* b) const override {
- GLProcessor::GenKey(*this, bt, caps, b);
+ void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
+ GLProcessor::GenKey(*this, caps, b);
}
- virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
- const GrGLSLCaps&) const override {
- return new GLProcessor(*this, bt);
+ GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override {
+ return new GLProcessor();
}
private:
« no previous file with comments | « src/gpu/GrGpu.h ('k') | src/gpu/GrPathProcessor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698