From 94efbf51f5a88d9e8aa961d3fbe38c5e335d6108 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Tue, 29 Nov 2016 13:43:05 -0500 Subject: Merge GrGLSLCaps into GrShaderCaps GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5121 Change-Id: If8d13638f80f42161cbc766a2666c5789e5772c8 Reviewed-on: https://skia-review.googlesource.com/5121 Reviewed-by: Ethan Nicholas Commit-Queue: Brian Salomon --- src/effects/SkTableColorFilter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/effects/SkTableColorFilter.cpp') diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 68fd13fdaa..c2683b5406 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -355,7 +355,7 @@ public: private: GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; @@ -380,7 +380,7 @@ class GLColorTableEffect : public GrGLSLFragmentProcessor { public: void emitCode(EmitArgs&) override; - static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*) {} + static void GenKey(const GrProcessor&, const GrShaderCaps&, GrProcessorKeyBuilder*) {} protected: void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override; @@ -499,7 +499,7 @@ ColorTableEffect::~ColorTableEffect() { } } -void ColorTableEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, +void ColorTableEffect::onGetGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const { GLColorTableEffect::GenKey(*this, caps, b); } -- cgit v1.2.3