diff options
| author |  bsalomon <bsalomon@google.com> | 2016-09-12 09:30:36 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-12 09:30:36 -0700 |
| commit | 1a1aa9303484106a955e5549bf8ae24950f54e7a (patch) | |
| tree | 512123db32ff1045b74f8ac2ef95d60bc4573a62 /src/effects/SkDisplacementMapEffect.cpp | |
| parent | a316395e66095aa1bf495525e34c991688467a45 (diff) | |
Remove unneeded GrGLSLTransformedCoordsArray type
Rename GrGLSLFragmentBuilder::ensureFSCoords2D to ensureCoords2D and make it take an arbitrary GrShaderVar.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2324663004
Review-Url: https://codereview.chromium.org/2324663004
Diffstat (limited to 'src/effects/SkDisplacementMapEffect.cpp')
| -rw-r--r-- | src/effects/SkDisplacementMapEffect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index df4103cf06..e74ca4fe3f 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -544,15 +544,15 @@ void GrGLDisplacementMapEffect::emitCode(EmitArgs& args) { GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder; fragBuilder->codeAppendf("\t\tvec4 %s = ", dColor); - fragBuilder->appendTextureLookup(args.fTexSamplers[0], args.fCoords[0].c_str(), - args.fCoords[0].getType()); + fragBuilder->appendTextureLookup(args.fTexSamplers[0], args.fTransformedCoords[0].c_str(), + args.fTransformedCoords[0].getType()); fragBuilder->codeAppend(";\n"); // Unpremultiply the displacement fragBuilder->codeAppendf( "\t\t%s.rgb = (%s.a < %s) ? vec3(0.0) : clamp(%s.rgb / %s.a, 0.0, 1.0);", dColor, dColor, nearZero, dColor, dColor); - SkString coords2D = fragBuilder->ensureFSCoords2D(args.fCoords, 1); + SkString coords2D = fragBuilder->ensureCoords2D(args.fTransformedCoords[1]); fragBuilder->codeAppendf("\t\tvec2 %s = %s + %s*(%s.", cCoords, coords2D.c_str(), scaleUni, dColor); |