diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-12-22 15:27:05 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-22 15:27:05 -0800 |
| commit | 8fc6c2d82c1f30ff82274334c01f0799def6a609 (patch) | |
| tree | 6499d32fd02b524167a690704d855e804f66c8a3 /src/effects | |
| parent | 16c8f14cd481b78673a33450a1395958e3e10e62 (diff) | |
This CL cleans up the last remaining users of localCoordChange on paint
NOTREECHECKS=True
BUG=skia:
Review URL: https://codereview.chromium.org/817853002
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkDisplacementMapEffect.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index 2c7f5ee8ce..d18d3c3b6a 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -564,9 +564,9 @@ void GrGLDisplacementMapEffect::emitCode(GrGLFPBuilder* builder, // Unpremultiply the displacement fsBuilder->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 = fsBuilder->ensureFSCoords2D(coords, 1); fsBuilder->codeAppendf("\t\tvec2 %s = %s + %s*(%s.", - cCoords, coords[1].c_str(), scaleUni, dColor); + cCoords, coords2D.c_str(), scaleUni, dColor); switch (fXChannelSelector) { case SkDisplacementMapEffect::kR_ChannelSelectorType: @@ -611,7 +611,9 @@ void GrGLDisplacementMapEffect::emitCode(GrGLFPBuilder* builder, "bool %s = (%s.x < 0.0) || (%s.y < 0.0) || (%s.x > 1.0) || (%s.y > 1.0);\t\t", outOfBounds, cCoords, cCoords, cCoords, cCoords); fsBuilder->codeAppendf("%s = %s ? vec4(0.0) : ", outputColor, outOfBounds); - fsBuilder->appendTextureLookup(samplers[1], cCoords, coords[1].getType()); + + // cCoords is always a vec2f + fsBuilder->appendTextureLookup(samplers[1], cCoords, kVec2f_GrSLType); fsBuilder->codeAppend(";\n"); } |