| Index: src/gpu/gl/GrGLGpu.cpp
|
| diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
|
| index 6b03df3e107aa07d5f5ce328de5d938265317c14..6daf9551706bc335f8d6a5588efe82f4633536a9 100644
|
| --- a/src/gpu/gl/GrGLGpu.cpp
|
| +++ b/src/gpu/gl/GrGLGpu.cpp
|
| @@ -3101,7 +3101,7 @@ static void get_tex_param_swizzle(GrPixelConfig config,
|
| }
|
| }
|
|
|
| -void GrGLGpu::bindTexture(int unitIdx, const GrTextureParams& params, bool dstConfigAllowsSRGB,
|
| +void GrGLGpu::bindTexture(int unitIdx, const GrTextureParams& params, bool allowSRGBInputs,
|
| GrGLTexture* texture) {
|
| SkASSERT(texture);
|
|
|
| @@ -3141,9 +3141,7 @@ void GrGLGpu::bindTexture(int unitIdx, const GrTextureParams& params, bool dstCo
|
| if (this->caps()->srgbSupport()) {
|
| // By default, the decision to allow SRGB decode is based on the destination config.
|
| // A texture can override that by specifying a value in GrTextureParams.
|
| - newTexParams.fSRGBDecode =
|
| - (dstConfigAllowsSRGB || GrTextureParams::kForceAllowSRGB_SRGBMode == params.srgbMode())
|
| - ? GR_GL_DECODE_EXT : GR_GL_SKIP_DECODE_EXT;
|
| + newTexParams.fSRGBDecode = allowSRGBInputs ? GR_GL_DECODE_EXT : GR_GL_SKIP_DECODE_EXT;
|
|
|
| if (setAll || newTexParams.fSRGBDecode != oldTexParams.fSRGBDecode) {
|
| this->setTextureUnit(unitIdx);
|
|
|