| Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| index 68b894846bb0ff89ffbdd837869f1f4f0492aaf6..57564414bcc041bcfc3d5b8f20c7577b4d2a3e2f 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| @@ -3397,6 +3397,10 @@ bool GLES2DecoderImpl::Initialize(
|
| glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
|
| }
|
|
|
| + if (feature_info_->feature_flags().desktop_srgb_support) {
|
| + glDisable(GL_FRAMEBUFFER_SRGB);
|
| + }
|
| +
|
| has_robustness_extension_ =
|
| context->HasExtension("GL_ARB_robustness") ||
|
| context->HasExtension("GL_KHR_robustness") ||
|
| @@ -4232,7 +4236,8 @@ bool GLES2DecoderImpl::CheckBoundDrawFramebufferValid(const char* func_name) {
|
| // behave correctly.
|
| bool enable_framebuffer_srgb =
|
| framebuffer && framebuffer->HasSRGBAttachments();
|
| - state_.EnableDisableFramebufferSRGB(enable_framebuffer_srgb);
|
| + state_.EnableDisableFramebufferSRGB(enable_framebuffer_srgb ?
|
| + FRAMEBUFFER_SRGB_ENABLED : FRAMEBUFFER_SRGB_DISABLED);
|
| }
|
| return valid;
|
| }
|
| @@ -4264,7 +4269,8 @@ bool GLES2DecoderImpl::CheckBoundFramebufferValid(const char* func_name) {
|
| bool enable_framebuffer_srgb =
|
| (draw_framebuffer && draw_framebuffer->HasSRGBAttachments()) ||
|
| (read_framebuffer && read_framebuffer->HasSRGBAttachments());
|
| - state_.EnableDisableFramebufferSRGB(enable_framebuffer_srgb);
|
| + state_.EnableDisableFramebufferSRGB(enable_framebuffer_srgb ?
|
| + FRAMEBUFFER_SRGB_ENABLED : FRAMEBUFFER_SRGB_DISABLED);
|
| }
|
|
|
| return valid;
|
|
|