Index: src/gpu/batches/GrAAConvexPathRenderer.cpp |
diff --git a/src/gpu/batches/GrAAConvexPathRenderer.cpp b/src/gpu/batches/GrAAConvexPathRenderer.cpp |
index 613b416601c7361190addb34d4564cd815c65c93..97f830828ea5a491fd5a81db723047e66ecb4002 100644 |
--- a/src/gpu/batches/GrAAConvexPathRenderer.cpp |
+++ b/src/gpu/batches/GrAAConvexPathRenderer.cpp |
@@ -543,8 +543,7 @@ public: |
class GLProcessor : public GrGLGeometryProcessor { |
public: |
- GLProcessor(const GrGeometryProcessor&, |
- const GrBatchTracker&) |
+ GLProcessor() |
: fColor(GrColor_ILLEGAL) {} |
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override { |
@@ -597,7 +596,6 @@ public: |
} |
static inline void GenKey(const GrGeometryProcessor& gp, |
- const GrBatchTracker& bt, |
const GrGLSLCaps&, |
GrProcessorKeyBuilder* b) { |
const QuadEdgeEffect& qee = gp.cast<QuadEdgeEffect>(); |
@@ -608,8 +606,7 @@ public: |
} |
virtual void setData(const GrGLProgramDataManager& pdman, |
bsalomon
2015/09/10 18:55:30
-virtual?
joshualitt
2015/09/10 20:08:05
Acknowledged.
|
- const GrPrimitiveProcessor& gp, |
- const GrBatchTracker& bt) override { |
+ const GrPrimitiveProcessor& gp) override { |
const QuadEdgeEffect& qe = gp.cast<QuadEdgeEffect>(); |
if (qe.color() != fColor) { |
GrGLfloat c[4]; |
@@ -633,15 +630,13 @@ public: |
typedef GrGLGeometryProcessor INHERITED; |
}; |
- virtual void getGLProcessorKey(const GrBatchTracker& bt, |
- const GrGLSLCaps& caps, |
+ virtual void getGLProcessorKey(const GrGLSLCaps& caps, |
bsalomon
2015/09/10 18:55:30
-virtual?
joshualitt
2015/09/10 20:08:05
Acknowledged.
|
GrProcessorKeyBuilder* b) const override { |
- GLProcessor::GenKey(*this, bt, caps, b); |
+ GLProcessor::GenKey(*this, caps, b); |
} |
- virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, |
- const GrGLSLCaps&) const override { |
- return new GLProcessor(*this, bt); |
+ virtual GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override { |
bsalomon
2015/09/10 18:55:30
-virtual?
joshualitt
2015/09/10 20:08:05
Acknowledged.
|
+ return new GLProcessor(); |
} |
private: |