diff options
author | egdaniel <egdaniel@google.com> | 2015-11-13 06:54:19 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-13 06:54:19 -0800 |
commit | 64c4728c70001ed074fecf5c4e083781987b12e9 (patch) | |
tree | 9c46b7028d1d04b526cca0671deb88aa003fc8d6 /include/gpu | |
parent | 6b90df6b1c6ed843be3ac09605050605f9ec9150 (diff) |
Make all GrFragmentProcessors GL independent.
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1434313002
Diffstat (limited to 'include/gpu')
-rw-r--r-- | include/gpu/GrFragmentProcessor.h | 6 | ||||
-rw-r--r-- | include/gpu/effects/GrConstColorProcessor.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/gpu/GrFragmentProcessor.h b/include/gpu/GrFragmentProcessor.h index 571139578a..428466212c 100644 --- a/include/gpu/GrFragmentProcessor.h +++ b/include/gpu/GrFragmentProcessor.h @@ -12,7 +12,7 @@ class GrCoordTransform; class GrGLSLCaps; -class GrGLFragmentProcessor; +class GrGLSLFragmentProcessor; class GrInvariantOutput; class GrProcessorKeyBuilder; @@ -63,7 +63,7 @@ public: ~GrFragmentProcessor() override; - GrGLFragmentProcessor* createGLInstance() const; + GrGLSLFragmentProcessor* createGLInstance() const; void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const { this->onGetGLProcessorKey(caps, b); @@ -166,7 +166,7 @@ private: /** Returns a new instance of the appropriate *GL* implementation class for the given GrFragmentProcessor; caller is responsible for deleting the object. */ - virtual GrGLFragmentProcessor* onCreateGLInstance() const = 0; + virtual GrGLSLFragmentProcessor* onCreateGLInstance() const = 0; /** Implemented using GLFragmentProcessor::GenKey as described in this class's comment. */ virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, diff --git a/include/gpu/effects/GrConstColorProcessor.h b/include/gpu/effects/GrConstColorProcessor.h index f5fdb7e35c..9f28167bc7 100644 --- a/include/gpu/effects/GrConstColorProcessor.h +++ b/include/gpu/effects/GrConstColorProcessor.h @@ -41,7 +41,7 @@ private: this->initClassID<GrConstColorProcessor>(); } - GrGLFragmentProcessor* onCreateGLInstance() const override; + GrGLSLFragmentProcessor* onCreateGLInstance() const override; void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; |