Revert of Optimize GLES2DecoderImpl::ApplyDirtyState.

gpu/command_buffer/service/context_state.h

 // 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.
 
 // This file contains the ContextState class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_
 
 #include <vector>
@@ skipping 83 matching lines @@
 };
 
 struct GPU_EXPORT ContextState {
   ContextState(FeatureInfo* feature_info,
                ErrorStateClient* error_state_client,
                Logger* logger);
   ~ContextState();
 
   void Initialize();
 
-  void SetIgnoreCachedStateForTest(bool ignore) {
-    ignore_cached_state = ignore;
-  }
-
   void RestoreState(const ContextState* prev_state) const;
   void InitCapabilities(const ContextState* prev_state) const;
   void InitState(const ContextState* prev_state) const;
 
   void RestoreActiveTexture() const;
   void RestoreAllTextureUnitBindings(const ContextState* prev_state) const;
   void RestoreActiveTextureUnitBinding(unsigned int target) const;
   void RestoreVertexAttribValues() const;
   void RestoreVertexAttribArrays(
       const scoped_refptr<VertexAttribManager> attrib_manager) const;
   void RestoreVertexAttribs() const;
   void RestoreBufferBindings() const;
   void RestoreGlobalState(const ContextState* prev_state) const;
   void RestoreProgramBindings() const;
   void RestoreRenderbufferBindings() const;
   void RestoreTextureUnitBindings(
       GLuint unit, const ContextState* prev_state) const;
 
   // Helper for getting cached state.
   bool GetStateAsGLint(
       GLenum pname, GLint* params, GLsizei* num_written) const;
   bool GetStateAsGLfloat(
       GLenum pname, GLfloat* params, GLsizei* num_written) const;
   bool GetEnabled(GLenum cap) const;
 
-  inline void SetDeviceColorMask(GLboolean red,
-                                 GLboolean green,
-                                 GLboolean blue,
-                                 GLboolean alpha) {
-    if (cached_color_mask_red == red && cached_color_mask_green == green &&
-        cached_color_mask_blue == blue && cached_color_mask_alpha == alpha &&
-        !ignore_cached_state)
-      return;
-    cached_color_mask_red = red;
-    cached_color_mask_green = green;
-    cached_color_mask_blue = blue;
-    cached_color_mask_alpha = alpha;
-    glColorMask(red, green, blue, alpha);
-  }
-
-  inline void SetDeviceDepthMask(GLboolean mask) {
-    if (cached_depth_mask == mask && !ignore_cached_state)
-      return;
-    cached_depth_mask = mask;
-    glDepthMask(mask);
-  }
-
-  inline void SetDeviceStencilMaskSeparate(GLenum op, GLuint mask) {
-    if (op == GL_FRONT) {
-      if (cached_stencil_front_writemask == mask && !ignore_cached_state)
-        return;
-      cached_stencil_front_writemask = mask;
-    } else if (op == GL_BACK) {
-      if (cached_stencil_back_writemask == mask && !ignore_cached_state)
-        return;
-      cached_stencil_back_writemask = mask;
-    } else {
-      NOTREACHED();
-      return;
-    }
-    glStencilMaskSeparate(op, mask);
-  }
-
   ErrorState* GetErrorState();
 
   #include "gpu/command_buffer/service/context_state_autogen.h"
 
   EnableFlags enable_flags;
 
   // Current active texture by 0 - n index.
   // In other words, if we call glActiveTexture(GL_TEXTURE2) this value would
   // be 2.
   GLuint active_texture_unit;
@@ skipping 16 matching lines @@
   scoped_refptr<Program> current_program;
 
   // The currently bound renderbuffer
   scoped_refptr<Renderbuffer> bound_renderbuffer;
 
   // A map of of target -> Query for current queries
   typedef std::map<GLuint, scoped_refptr<QueryManager::Query> > QueryMap;
   QueryMap current_queries;
 
   bool pack_reverse_row_order;
-  bool ignore_cached_state;
 
   mutable bool fbo_binding_for_scissor_workaround_dirty_;
   FeatureInfo* feature_info_;
 
  private:
   scoped_ptr<ErrorState> error_state_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_