diff options
| author |  rmistry <rmistry@google.com> | 2015-04-01 15:51:33 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-01 15:51:34 -0700 |
| commit | fd40a249d814c3ca990422348266662a1521fb45 (patch) | |
| tree | 5ff2de5f710c72c13195aa1a7bc8c2d50c488762 /src | |
| parent | f90cd8e0e39af02c3826c80366efa3c06e88f642 (diff) | |
Revert of Fix GLSL error on Android. (patchset #2 id:20001 of https://codereview.chromium.org/1053873002/)
Reason for revert:
Spoke to Stephan about this. Reverting because failing debug builds:
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Mac10.9-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug/builds/51
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug/builds/54
Original issue's description:
> Fix GLSL error on Android.
>
> BUG=skia:
> TBR=bsalomon
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: https://skia.googlesource.com/skia/+/f90cd8e0e39af02c3826c80366efa3c06e88f642
TBR=bsalomon@google.com,senorblanco@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1056713002
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/effects/GrMatrixConvolutionEffect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp index 0b0a8af194..f6b99eff8f 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp +++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp @@ -90,7 +90,7 @@ void GrGLMatrixConvolutionEffect::emitCode(GrGLFPBuilder* builder, fDomain.sampleTexture(fsBuilder, domain, "c", coord, samplers[0]); if (!fConvolveAlpha) { fsBuilder->codeAppend("c.rgb /= c.a;"); - fsBuilder->codeAppend("c.rgb = clamp(c.rgb, 0.0, 1.0);"); + fsBuilder->codeAppend("c.rgb = clamp(c.rgb, 0, 1);"); } fsBuilder->codeAppend("sum += c * k;"); } |