Revert of Add command buffer support for EXT_sRGB_write_control

gpu/command_buffer/service/context_state.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/context_state.h"
 
 #include <stddef.h>
 
 #include <cmath>
 
@@ skipping 203 matching lines @@
 }
 
 ContextState::ContextState(FeatureInfo* feature_info,
                            ErrorStateClient* error_state_client,
                            Logger* logger)
     : active_texture_unit(0),
       bound_renderbuffer_valid(false),
       pack_reverse_row_order(false),
       ignore_cached_state(false),
       fbo_binding_for_scissor_workaround_dirty(false),
+      framebuffer_srgb_(false),
       feature_info_(feature_info),
       error_state_(ErrorState::Create(error_state_client, logger)) {
   Initialize();
 }
 
 ContextState::~ContextState() {
 }
 
 void ContextState::SetLineWidthBounds(GLfloat min, GLfloat max) {
   line_width_min_ = min;
@@ skipping 263 matching lines @@
 
 void ContextState::RestoreState(const ContextState* prev_state) {
   RestoreAllTextureUnitBindings(prev_state);
   RestoreVertexAttribs();
   RestoreBufferBindings();
   RestoreRenderbufferBindings();
   RestoreProgramSettings(prev_state, true);
   RestoreIndexedUniformBufferBindings(prev_state);
   RestoreGlobalState(prev_state);
 
-  // FRAMEBUFFER_SRGB will be restored lazily at render time.
-  framebuffer_srgb_valid_ = false;
+  if (!prev_state) {
+    if (feature_info_->feature_flags().desktop_srgb_support) {
+      framebuffer_srgb_ = false;
+      glDisable(GL_FRAMEBUFFER_SRGB);
+    }
+  } else if (framebuffer_srgb_ != prev_state->framebuffer_srgb_) {
+    // FRAMEBUFFER_SRGB will be restored lazily at render time.
+    framebuffer_srgb_ = prev_state->framebuffer_srgb_;
+  }
 }
 
 ErrorState* ContextState::GetErrorState() {
   return error_state_.get();
 }
 
 void ContextState::EnableDisable(GLenum pname, bool enable) const {
   if (pname == GL_PRIMITIVE_RESTART_FIXED_INDEX &&
       feature_info_->feature_flags().emulate_primitive_restart_fixed_index) {
     // GLES2DecoderImpl::DoDrawElements can handle this situation
@@ skipping 172 matching lines @@
   PixelStoreParams params;
   params.alignment = unpack_alignment;
   params.row_length = unpack_row_length;
   if (dimension == k3D) {
     params.image_height = unpack_image_height;
   }
   return params;
 }
 
 void ContextState::EnableDisableFramebufferSRGB(bool enable) {
-  if (framebuffer_srgb_valid_ && framebuffer_srgb_ == enable)
+  if (framebuffer_srgb_ == enable)
     return;
   EnableDisable(GL_FRAMEBUFFER_SRGB, enable);
   framebuffer_srgb_ = enable;
-  framebuffer_srgb_valid_ = true;
 }
 
 void ContextState::InitStateManual(const ContextState*) const {
   // Here we always reset the states whether it's different from previous ones.
   // We have very limited states here; also, once we switch to MANGLE, MANGLE
   // will opmitize this.
   UpdatePackParameters();
   UpdateUnpackParameters();
 }
 
 // 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 "gpu/command_buffer/service/context_state_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu