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/GrDefaultGeoProcFactory.cpp | |
| parent | 33bee090fa332b2f3db366ae0ecc3231bd8e112e (diff) | |
Move all ShaderBuilder files to GLSL
BUG=skia:
Review URL: https://codereview.chromium.org/1438003003
Diffstat (limited to 'src/gpu/GrDefaultGeoProcFactory.cpp')
| -rw-r--r-- | src/gpu/GrDefaultGeoProcFactory.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp index b1cedd2c2d..6c73c361ca 100644 --- a/src/gpu/GrDefaultGeoProcFactory.cpp +++ b/src/gpu/GrDefaultGeoProcFactory.cpp @@ -10,7 +10,9 @@ #include "GrInvariantOutput.h" #include "gl/GrGLGeometryProcessor.h" #include "gl/GrGLUtil.h" -#include "gl/builders/GrGLProgramBuilder.h" +#include "glsl/GrGLSLFragmentShaderBuilder.h" +#include "glsl/GrGLSLProgramBuilder.h" +#include "glsl/GrGLSLVertexShaderBuilder.h" /* * The default Geometry Processor simply takes position and multiplies it by the uniform view @@ -62,8 +64,8 @@ public: void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override { const DefaultGeoProc& gp = args.fGP.cast<DefaultGeoProc>(); GrGLSLGPBuilder* pb = args.fPB; - GrGLVertexBuilder* vsBuilder = pb->getVertexShaderBuilder(); - GrGLFragmentBuilder* fs = args.fPB->getFragmentShaderBuilder(); + GrGLSLVertexBuilder* vsBuilder = pb->getVertexShaderBuilder(); + GrGLSLFragmentBuilder* fs = args.fPB->getFragmentShaderBuilder(); // emit attributes vsBuilder->emitAttributes(gp); @@ -105,7 +107,7 @@ public: fs->codeAppendf("%s = vec4(1);", args.fOutputCoverage); } else { const char* fragCoverage; - fCoverageUniform = pb->addUniform(GrGLProgramBuilder::kFragment_Visibility, + fCoverageUniform = pb->addUniform(GrGLSLProgramBuilder::kFragment_Visibility, kFloat_GrSLType, kDefault_GrSLPrecision, "Coverage", |