diff options
| author |  egdaniel <egdaniel@google.com> | 2015-11-11 13:06:05 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-11 13:06:05 -0800 |
| commit | 2d721d33aad192cc8a7a1321504b39bdca2a57ce (patch) | |
| tree | 9346095693532367c5c5944d77d584b7ba08b52d /src/gpu/effects/GrConfigConversionEffect.cpp | |
| parent | 33bee090fa332b2f3db366ae0ecc3231bd8e112e (diff) | |
Move all ShaderBuilder files to GLSL
BUG=skia:
Review URL: https://codereview.chromium.org/1438003003
Diffstat (limited to 'src/gpu/effects/GrConfigConversionEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index 5f51f6a2c7..160773d81e 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -12,7 +12,8 @@ #include "GrSimpleTextureEffect.h" #include "SkMatrix.h" #include "gl/GrGLFragmentProcessor.h" -#include "gl/builders/GrGLProgramBuilder.h" +#include "glsl/GrGLSLFragmentShaderBuilder.h" +#include "glsl/GrGLSLProgramBuilder.h" class GrGLConfigConversionEffect : public GrGLFragmentProcessor { public: @@ -29,7 +30,7 @@ public: SkString tmpDecl; tmpVar.appendDecl(args.fBuilder->glslCaps(), &tmpDecl); - GrGLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); + GrGLSLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); fsBuilder->codeAppendf("%s;", tmpDecl.c_str()); @@ -142,7 +143,7 @@ const GrFragmentProcessor* GrConfigConversionEffect::TestCreate(GrProcessorTestD /////////////////////////////////////////////////////////////////////////////// void GrConfigConversionEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { + GrProcessorKeyBuilder* b) const { GrGLConfigConversionEffect::GenKey(*this, caps, b); } |