| Index: src/gpu/effects/GrDashingEffect.cpp
|
| diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp
|
| index b6dbbd6e0ed19f877ca6c3c5b391e7334fe0923d..28f08c31fd07d94a2abd72f5a20d1b25e43d3bcd 100644
|
| --- a/src/gpu/effects/GrDashingEffect.cpp
|
| +++ b/src/gpu/effects/GrDashingEffect.cpp
|
| @@ -796,11 +796,11 @@ public:
|
| DashAAMode aaMode() const { return fAAMode; }
|
|
|
| virtual void getGLProcessorKey(const GrBatchTracker&,
|
| - const GrGLCaps&,
|
| + const GrGLSLCaps&,
|
| GrProcessorKeyBuilder* b) const override;
|
|
|
| virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker&,
|
| - const GrGLCaps&) const override;
|
| + const GrGLSLCaps&) const override;
|
|
|
| void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const override;
|
|
|
| @@ -835,7 +835,7 @@ public:
|
|
|
| static inline void GenKey(const GrGeometryProcessor&,
|
| const GrBatchTracker&,
|
| - const GrGLCaps&,
|
| + const GrGLSLCaps&,
|
| GrProcessorKeyBuilder*);
|
|
|
| virtual void setData(const GrGLProgramDataManager&,
|
| @@ -924,7 +924,7 @@ void GLDashingCircleEffect::setData(const GrGLProgramDataManager& pdman,
|
|
|
| void GLDashingCircleEffect::GenKey(const GrGeometryProcessor& gp,
|
| const GrBatchTracker& bt,
|
| - const GrGLCaps&,
|
| + const GrGLSLCaps&,
|
| GrProcessorKeyBuilder* b) {
|
| const DashingCircleBatchTracker& local = bt.cast<DashingCircleBatchTracker>();
|
| const DashingCircleEffect& dce = gp.cast<DashingCircleEffect>();
|
| @@ -950,13 +950,13 @@ void DashingCircleEffect::onGetInvariantOutputCoverage(GrInitInvariantOutput* ou
|
| }
|
|
|
| void DashingCircleEffect::getGLProcessorKey(const GrBatchTracker& bt,
|
| - const GrGLCaps& caps,
|
| + const GrGLSLCaps& caps,
|
| GrProcessorKeyBuilder* b) const {
|
| GLDashingCircleEffect::GenKey(*this, bt, caps, b);
|
| }
|
|
|
| GrGLPrimitiveProcessor* DashingCircleEffect::createGLInstance(const GrBatchTracker& bt,
|
| - const GrGLCaps&) const {
|
| + const GrGLSLCaps&) const {
|
| return SkNEW_ARGS(GLDashingCircleEffect, (*this, bt));
|
| }
|
|
|
| @@ -1044,11 +1044,11 @@ public:
|
| DashAAMode aaMode() const { return fAAMode; }
|
|
|
| virtual void getGLProcessorKey(const GrBatchTracker& bt,
|
| - const GrGLCaps& caps,
|
| + const GrGLSLCaps& caps,
|
| GrProcessorKeyBuilder* b) const override;
|
|
|
| virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
|
| - const GrGLCaps&) const override;
|
| + const GrGLSLCaps&) const override;
|
|
|
| void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const override;
|
|
|
| @@ -1083,7 +1083,7 @@ public:
|
|
|
| static inline void GenKey(const GrGeometryProcessor&,
|
| const GrBatchTracker&,
|
| - const GrGLCaps&,
|
| + const GrGLSLCaps&,
|
| GrProcessorKeyBuilder*);
|
|
|
| virtual void setData(const GrGLProgramDataManager&,
|
| @@ -1184,7 +1184,7 @@ void GLDashingLineEffect::setData(const GrGLProgramDataManager& pdman,
|
|
|
| void GLDashingLineEffect::GenKey(const GrGeometryProcessor& gp,
|
| const GrBatchTracker& bt,
|
| - const GrGLCaps&,
|
| + const GrGLSLCaps&,
|
| GrProcessorKeyBuilder* b) {
|
| const DashingLineBatchTracker& local = bt.cast<DashingLineBatchTracker>();
|
| const DashingLineEffect& de = gp.cast<DashingLineEffect>();
|
| @@ -1210,13 +1210,13 @@ void DashingLineEffect::onGetInvariantOutputCoverage(GrInitInvariantOutput* out)
|
| }
|
|
|
| void DashingLineEffect::getGLProcessorKey(const GrBatchTracker& bt,
|
| - const GrGLCaps& caps,
|
| + const GrGLSLCaps& caps,
|
| GrProcessorKeyBuilder* b) const {
|
| GLDashingLineEffect::GenKey(*this, bt, caps, b);
|
| }
|
|
|
| GrGLPrimitiveProcessor* DashingLineEffect::createGLInstance(const GrBatchTracker& bt,
|
| - const GrGLCaps&) const {
|
| + const GrGLSLCaps&) const {
|
| return SkNEW_ARGS(GLDashingLineEffect, (*this, bt));
|
| }
|
|
|
|
|