Disable FRAMEBUFFER_SRGB when restoring from a null context state

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ skipping 3379 matching lines @@
   // ES3 requires seamless cubemap. ES2 does not.
   // However, when ES2 is implemented on top of DX11, seamless cubemap is
   // always enabled and there is no way to disable it.
   // Therefore, it seems OK to also always enable it on top of Desktop GL for
   // both ES2 and ES3 contexts.
   if (!feature_info_->workarounds().disable_texture_cube_map_seamless &&
       gl_version_info().IsAtLeastGL(3, 2)) {
     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") ||
       context->HasExtension("GL_EXT_robustness");
 
   if (!InitializeShaderTranslator()) {
     return false;
   }
 
   GLint viewport_params[4] = { 0 };
@@ skipping 815 matching lines @@
   if (valid && feature_info_->feature_flags().desktop_srgb_support) {
     // If framebuffer contains sRGB images, then enable FRAMEBUFFER_SRGB.
     // Otherwise, disable FRAMEBUFFER_SRGB. Assume default fbo does not have
     // sRGB image.
     // In theory, we can just leave FRAMEBUFFER_SRGB on. However, many drivers
     // behave incorrectly when all images are linear encoding, they still apply
     // the sRGB conversion, but when at least one image is sRGB, then they
     // 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;
 }
 
 bool GLES2DecoderImpl::CheckBoundReadFramebufferValid(
     const char* func_name, GLenum gl_error) {
   GLenum target = features().chromium_framebuffer_multisample ?
       GL_READ_FRAMEBUFFER : GL_FRAMEBUFFER;
   Framebuffer* framebuffer = GetFramebufferInfoForTarget(target);
   bool valid = CheckFramebufferValid(
@@ skipping 11 matching lines @@
   target = features().chromium_framebuffer_multisample ?
       GL_READ_FRAMEBUFFER : GL_FRAMEBUFFER;
   Framebuffer* read_framebuffer = GetFramebufferInfoForTarget(target);
   valid = valid && CheckFramebufferValid(
       read_framebuffer, target, GL_INVALID_FRAMEBUFFER_OPERATION, func_name);
 
   if (valid && feature_info_->feature_flags().desktop_srgb_support) {
     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;
 }
 
 GLint GLES2DecoderImpl::GetColorEncodingFromInternalFormat(
     GLenum internalformat) {
   switch (internalformat) {
     case GL_SRGB_EXT:
     case GL_SRGB_ALPHA_EXT:
@@ skipping 13465 matching lines @@
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "base/macros.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu