Chromium Code Reviews| Index: src/effects/SkLightingImageFilter.cpp |
| diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp |
| index 4265f6e1e53c23137f5ca9db523169c44bde5c40..ec7d72fe2db0c242723343601a8cf853e982fe03 100644 |
| --- a/src/effects/SkLightingImageFilter.cpp |
| +++ b/src/effects/SkLightingImageFilter.cpp |
| @@ -855,7 +855,7 @@ public: |
| : INHERITED(color), |
| fLocation(location), |
| fTarget(target), |
| - fSpecularExponent(SkScalarPin(specularExponent, kSpecularExponentMin, kSpecularExponentMax)) |
|
Stephen White
2015/10/16 15:03:10
Although it may not be spec-correct, this was adde
ericrk
2015/10/16 18:36:23
Per offline discussion - going to remove and see i
|
| + fSpecularExponent(specularExponent) |
| { |
| fS = target - location; |
| fast_normalize(&fS); |
| @@ -1996,7 +1996,7 @@ void GrGLSpotLight::emitLightColor(GrGLFPBuilder* builder, |
| lightColorBody.appendf("\t\treturn %s * scale * (cosAngle - %s) * %s;\n", |
| color, cosOuter, coneScale); |
| lightColorBody.appendf("\t}\n"); |
| - lightColorBody.appendf("\treturn %s;\n", color); |
| + lightColorBody.appendf("\treturn %s * scale;\n", color); |
| GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); |
| fsBuilder->emitFunction(kVec3f_GrSLType, |
| "lightColor", |