Clean up of GLES2 Command Decoder by moving some of the error state into a separate class.

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>
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/query_manager.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
 #include "gpu/command_buffer/service/vertex_array_manager.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 
 class Buffer;
+class ErrorState;
 class FeatureInfo;
 class Framebuffer;
 class Program;
 class Renderbuffer;
 
 // State associated with each texture unit.
 struct GPU_EXPORT TextureUnit {
   TextureUnit();
   ~TextureUnit();
 
@@ skipping 51 matching lines @@
   Vec4() {
     v[0] = 0.0f;
     v[1] = 0.0f;
     v[2] = 0.0f;
     v[3] = 1.0f;
   }
   float v[4];
 };
 
 struct GPU_EXPORT ContextState {
-  explicit ContextState(FeatureInfo* feature_info);
+  ContextState(FeatureInfo* feature_info, Logger* logger);
   ~ContextState();
 
   void Initialize();
 
   void RestoreState() const;
   void InitCapabilities() const;
   void InitState() const;
 
   void RestoreActiveTexture() const;
   void RestoreAttribute(GLuint index) const;
   void RestoreBufferBindings() const;
   void RestoreGlobalState() const;
   void RestoreProgramBindings() const;
   void RestoreRenderbufferBindings() const;
   void RestoreTextureUnitBindings(GLuint unit) 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;
 
+  ErrorState* GetErrorState();
+
   #include "gpu/command_buffer/service/context_state_autogen.h"
 
   EnableFlags enable_flags;
 
   // pack alignment as last set by glPixelStorei
   GLint pack_alignment;
 
   // unpack alignment as last set by glPixelStorei
   GLint unpack_alignment;
 
@@ skipping 26 matching lines @@
   scoped_refptr<Renderbuffer> bound_renderbuffer;
 
   scoped_refptr<QueryManager::Query> current_query;
 
   GLenum hint_generate_mipmap;
   GLenum hint_fragment_shader_derivative;
 
   bool pack_reverse_row_order;
 
   mutable bool fbo_binding_for_scissor_workaround_dirty_;
+  FeatureInfo* feature_info_;
 
-  FeatureInfo* feature_info_;
+ private:
+  scoped_ptr<ErrorState> error_state_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_