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 /src/effects/SkArithmeticMode_gpu.cpp | |
| parent | 6b90df6b1c6ed843be3ac09605050605f9ec9150 (diff) | |
Make all GrFragmentProcessors GL independent.
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1434313002
Diffstat (limited to 'src/effects/SkArithmeticMode_gpu.cpp')
| -rw-r--r-- | src/effects/SkArithmeticMode_gpu.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp index ebc8293b20..2ab5172b57 100644 --- a/src/effects/SkArithmeticMode_gpu.cpp +++ b/src/effects/SkArithmeticMode_gpu.cpp @@ -13,9 +13,8 @@ #include "GrInvariantOutput.h" #include "GrProcessor.h" #include "GrTexture.h" -#include "gl/GrGLCaps.h" -#include "gl/GrGLFragmentProcessor.h" #include "gl/GrGLXferProcessor.h" +#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -54,7 +53,7 @@ static void add_arithmetic_code(GrGLSLFragmentBuilder* fsBuilder, } } -class GLArithmeticFP : public GrGLFragmentProcessor { +class GLArithmeticFP : public GrGLSLFragmentProcessor { public: GLArithmeticFP(const GrArithmeticFP& arithmeticFP) : fEnforcePMColor(arithmeticFP.enforcePMColor()) {} @@ -92,7 +91,7 @@ private: GrGLSLProgramDataManager::UniformHandle fKUni; bool fEnforcePMColor; - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; /////////////////////////////////////////////////////////////////////////////// @@ -111,7 +110,7 @@ void GrArithmeticFP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyB GLArithmeticFP::GenKey(*this, caps, b); } -GrGLFragmentProcessor* GrArithmeticFP::onCreateGLInstance() const { +GrGLSLFragmentProcessor* GrArithmeticFP::onCreateGLInstance() const { return new GLArithmeticFP(*this); } |