diff options
| author |  jvanverth <jvanverth@google.com> | 2015-04-28 08:48:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-28 08:48:20 -0700 |
| commit | cfc18867d982119d9dc2888bf09f1093012daadd (patch) | |
| tree | af55e571828da1a7353457451bafab547079fa1f /src/gpu/effects/GrOvalEffect.cpp | |
| parent | 77772f3ca36c3fb7f2195615cce2adac2be2fec6 (diff) | |
Use GLSLCaps for creating processor keys and GLSL-specific programs
Effectively all this does is future-proof any GLSL-specific code, as
GLSLCaps is just a typedef of GLCaps.
BUG=skia:
Review URL: https://codereview.chromium.org/1109863004
Diffstat (limited to 'src/gpu/effects/GrOvalEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrOvalEffect.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index 0adbb67b9c..bce3c01b2c 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -24,7 +24,7 @@ public: const char* name() const override { return "Circle"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; + void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; GrGLFragmentProcessor* createGLInstance() const override; @@ -104,7 +104,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; @@ -156,7 +156,7 @@ void GLCircleEffect::emitCode(GrGLFPBuilder* builder, (GrGLSLExpr4(inputColor) * GrGLSLExpr1("d")).c_str()); } -void GLCircleEffect::GenKey(const GrProcessor& processor, const GrGLCaps&, +void GLCircleEffect::GenKey(const GrProcessor& processor, const GrGLSLCaps&, GrProcessorKeyBuilder* b) { const CircleEffect& ce = processor.cast<CircleEffect>(); b->add32(ce.getEdgeType()); @@ -179,7 +179,7 @@ void GLCircleEffect::setData(const GrGLProgramDataManager& pdman, const GrProces /////////////////////////////////////////////////////////////////////////////////////////////////// -void CircleEffect::getGLProcessorKey(const GrGLCaps& caps, +void CircleEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLCircleEffect::GenKey(*this, caps, b); } @@ -199,7 +199,7 @@ public: const char* name() const override { return "Ellipse"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; + void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; GrGLFragmentProcessor* createGLInstance() const override; @@ -282,7 +282,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; @@ -347,7 +347,7 @@ void GLEllipseEffect::emitCode(GrGLFPBuilder* builder, (GrGLSLExpr4(inputColor) * GrGLSLExpr1("alpha")).c_str()); } -void GLEllipseEffect::GenKey(const GrProcessor& effect, const GrGLCaps&, +void GLEllipseEffect::GenKey(const GrProcessor& effect, const GrGLSLCaps&, GrProcessorKeyBuilder* b) { const EllipseEffect& ee = effect.cast<EllipseEffect>(); b->add32(ee.getEdgeType()); @@ -366,7 +366,7 @@ void GLEllipseEffect::setData(const GrGLProgramDataManager& pdman, const GrProce /////////////////////////////////////////////////////////////////////////////////////////////////// -void EllipseEffect::getGLProcessorKey(const GrGLCaps& caps, +void EllipseEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { GLEllipseEffect::GenKey(*this, caps, b); } |