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 /gm | |
parent | 33bee090fa332b2f3db366ae0ecc3231bd8e112e (diff) |
Move all ShaderBuilder files to GLSL
BUG=skia:
Review URL: https://codereview.chromium.org/1438003003
Diffstat (limited to 'gm')
-rw-r--r-- | gm/dcshader.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gm/dcshader.cpp b/gm/dcshader.cpp index d1a9d4ca6f..828c8dcf51 100644 --- a/gm/dcshader.cpp +++ b/gm/dcshader.cpp @@ -12,7 +12,8 @@ #include "GrCoordTransform.h" #include "effects/GrXfermodeFragmentProcessor.h" #include "gl/GrGLFragmentProcessor.h" -#include "gl/builders/GrGLProgramBuilder.h" +#include "glsl/GrGLSLFragmentShaderBuilder.h" +#include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" #include "Resources.h" #include "SkReadBuffer.h" @@ -66,7 +67,7 @@ public: GrGLFragmentProcessor* onCreateGLInstance() const override { class DCGLFP : public GrGLFragmentProcessor { void emitCode(EmitArgs& args) override { - GrGLFragmentBuilder* fpb = args.fBuilder->getFragmentShaderBuilder(); + GrGLSLFragmentBuilder* fpb = args.fBuilder->getFragmentShaderBuilder(); fpb->codeAppendf("vec2 c = %s;", fpb->ensureFSCoords2D(args.fCoords, 0).c_str()); fpb->codeAppend("vec2 r = mod(c, vec2(20.0));"); fpb->codeAppend("vec4 color = vec4(0.5*sin(c.x / 15.0) + 0.5," |