| Index: src/gpu/effects/GrConvexPolyEffect.cpp
|
| diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp
|
| index a231df495d30794e42513fc5a3f0afec54c92058..538800e4361479b2351666d7946c961b8d955780 100644
|
| --- a/src/gpu/effects/GrConvexPolyEffect.cpp
|
| +++ b/src/gpu/effects/GrConvexPolyEffect.cpp
|
| @@ -25,7 +25,7 @@ public:
|
|
|
| const char* name() const override { return "AARect"; }
|
|
|
| - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override;
|
| + void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
|
|
|
| GrGLFragmentProcessor* createGLInstance() const override;
|
|
|
| @@ -92,7 +92,7 @@ public:
|
| const TransformedCoordsArray&,
|
| const TextureSamplerArray&) override;
|
|
|
| - static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
|
| + static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
|
|
|
| void setData(const GrGLProgramDataManager&, const GrProcessor&) override;
|
|
|
| @@ -160,13 +160,13 @@ void GLAARectEffect::setData(const GrGLProgramDataManager& pdman, const GrProces
|
| }
|
| }
|
|
|
| -void GLAARectEffect::GenKey(const GrProcessor& processor, const GrGLCaps&,
|
| +void GLAARectEffect::GenKey(const GrProcessor& processor, const GrGLSLCaps&,
|
| GrProcessorKeyBuilder* b) {
|
| const AARectEffect& aare = processor.cast<AARectEffect>();
|
| b->add32(aare.getEdgeType());
|
| }
|
|
|
| -void AARectEffect::getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const {
|
| +void AARectEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
|
| GLAARectEffect::GenKey(*this, caps, b);
|
| }
|
|
|
| @@ -187,7 +187,7 @@ public:
|
| const TransformedCoordsArray&,
|
| const TextureSamplerArray&) override;
|
|
|
| - static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
|
| + static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
|
|
|
| void setData(const GrGLProgramDataManager&, const GrProcessor&) override;
|
|
|
| @@ -252,7 +252,7 @@ void GrGLConvexPolyEffect::setData(const GrGLProgramDataManager& pdman, const Gr
|
| }
|
| }
|
|
|
| -void GrGLConvexPolyEffect::GenKey(const GrProcessor& processor, const GrGLCaps&,
|
| +void GrGLConvexPolyEffect::GenKey(const GrProcessor& processor, const GrGLSLCaps&,
|
| GrProcessorKeyBuilder* b) {
|
| const GrConvexPolyEffect& cpe = processor.cast<GrConvexPolyEffect>();
|
| GR_STATIC_ASSERT(kGrProcessorEdgeTypeCnt <= 8);
|
| @@ -326,7 +326,7 @@ void GrConvexPolyEffect::onComputeInvariantOutput(GrInvariantOutput* inout) cons
|
| inout->mulByUnknownSingleComponent();
|
| }
|
|
|
| -void GrConvexPolyEffect::getGLProcessorKey(const GrGLCaps& caps,
|
| +void GrConvexPolyEffect::getGLProcessorKey(const GrGLSLCaps& caps,
|
| GrProcessorKeyBuilder* b) const {
|
| GrGLConvexPolyEffect::GenKey(*this, caps, b);
|
| }
|
|
|