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/GrOvalRenderer.cpp | |
| parent | 33bee090fa332b2f3db366ae0ecc3231bd8e112e (diff) | |
Move all ShaderBuilder files to GLSL
BUG=skia:
Review URL: https://codereview.chromium.org/1438003003
Diffstat (limited to 'src/gpu/GrOvalRenderer.cpp')
| -rw-r--r-- | src/gpu/GrOvalRenderer.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index 4f51c03a4e..c5d807c8e8 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -23,8 +23,10 @@ #include "effects/GrRRectEffect.h" #include "gl/GrGLUtil.h" #include "gl/GrGLGeometryProcessor.h" -#include "gl/builders/GrGLProgramBuilder.h" +#include "glsl/GrGLSLFragmentShaderBuilder.h" +#include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" +#include "glsl/GrGLSLVertexShaderBuilder.h" // TODO(joshualitt) - Break this file up during GrBatch post implementation cleanup @@ -96,7 +98,7 @@ public: void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{ const CircleEdgeEffect& ce = args.fGP.cast<CircleEdgeEffect>(); GrGLSLGPBuilder* pb = args.fPB; - GrGLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder(); + GrGLSLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder(); // emit attributes vsBuilder->emitAttributes(ce); @@ -117,7 +119,7 @@ public: this->emitTransforms(args.fPB, gpArgs->fPositionVar, ce.inPosition()->fName, ce.localMatrix(), args.fTransformsIn, args.fTransformsOut); - GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLSLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); fsBuilder->codeAppendf("float d = length(%s.xy);", v.fsIn()); fsBuilder->codeAppendf("float edgeAlpha = clamp(%s.z * (1.0 - d), 0.0, 1.0);", v.fsIn()); if (ce.isStroked()) { @@ -244,7 +246,7 @@ public: void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{ const EllipseEdgeEffect& ee = args.fGP.cast<EllipseEdgeEffect>(); GrGLSLGPBuilder* pb = args.fPB; - GrGLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder(); + GrGLSLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder(); // emit attributes vsBuilder->emitAttributes(ee); @@ -272,7 +274,7 @@ public: ee.localMatrix(), args.fTransformsIn, args.fTransformsOut); // for outer curve - GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLSLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); fsBuilder->codeAppendf("vec2 scaledOffset = %s*%s.xy;", ellipseOffsets.fsIn(), ellipseRadii.fsIn()); fsBuilder->codeAppend("float test = dot(scaledOffset, scaledOffset) - 1.0;"); @@ -419,7 +421,7 @@ public: void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override { const DIEllipseEdgeEffect& ee = args.fGP.cast<DIEllipseEdgeEffect>(); GrGLSLGPBuilder* pb = args.fPB; - GrGLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder(); + GrGLSLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder(); // emit attributes vsBuilder->emitAttributes(ee); @@ -447,9 +449,9 @@ public: this->emitTransforms(args.fPB, gpArgs->fPositionVar, ee.inPosition()->fName, args.fTransformsIn, args.fTransformsOut); - GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLSLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); SkAssertResult(fsBuilder->enableFeature( - GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature)); + GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature)); // for outer curve fsBuilder->codeAppendf("vec2 scaledOffset = %s.xy;", offsets0.fsIn()); fsBuilder->codeAppend("float test = dot(scaledOffset, scaledOffset) - 1.0;"); |