Cache more GL state both service and client side.

gpu/command_buffer/client/gles2_implementation.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.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 
 #include <GLES2/gl2.h>
 
 #include <map>
 #include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "../common/compiler_specific.h"
 #include "../common/debug_marker_manager.h"
 #include "../common/gles2_cmd_utils.h"
 #include "../common/scoped_ptr.h"
 #include "../client/ref_counted.h"
+#include "../client/client_context_state.h"
 #include "../client/gles2_cmd_helper.h"
 #include "../client/gles2_interface.h"
 #include "../client/query_tracker.h"
 #include "../client/ring_buffer.h"
 #include "../client/share_group.h"
 #include "gles2_impl_export.h"
 
 #if !defined(NDEBUG) && !defined(__native_client__) && !defined(GLES2_CONFORMANCE_TESTS)  // NOLINT
   #if defined(GLES2_INLINE_OPTIMIZATION)
     // TODO(gman): Replace with macros that work with inline optmization.
@@ skipping 70 matching lines @@
 // GLES2CmdHelper but that entails changing your code to use and deal with
 // shared memory and synchronization issues.
 class GLES2_IMPL_EXPORT GLES2Implementation : public GLES2Interface {
  public:
   class ErrorMessageCallback {
    public:
     virtual ~ErrorMessageCallback() { }
     virtual void OnErrorMessage(const char* msg, int id) = 0;
   };
 
-  // Stores client side cached GL state.
-  struct GLCachedState {
+  // Stores GL state that never changes.
+  struct GLStaticState {
     struct GLES2_IMPL_EXPORT IntState {
       IntState();
       GLint max_combined_texture_image_units;
       GLint max_cube_map_texture_size;
       GLint max_fragment_uniform_vectors;
       GLint max_renderbuffer_size;
       GLint max_texture_image_units;
       GLint max_texture_size;
       GLint max_varying_vectors;
       GLint max_vertex_attribs;
       GLint max_vertex_texture_image_units;
       GLint max_vertex_uniform_vectors;
       GLint num_compressed_texture_formats;
       GLint num_shader_binary_formats;
     };
-    struct EnableState {
-      EnableState()
-          : blend(false),
-            cull_face(false),
-            depth_test(false),
-            dither(false),
-            polygon_offset_fill(false),
-            sample_alpha_to_coverage(false),
-            sample_coverage(false),
-            scissor_test(false),
-            stencil_test(false) {
-      }
-
-      bool blend;
-      bool cull_face;
-      bool depth_test;
-      bool dither;
-      bool polygon_offset_fill;
-      bool sample_alpha_to_coverage;
-      bool sample_coverage;
-      bool scissor_test;
-      bool stencil_test;
-    };
-
     IntState int_state;
-    EnableState enable_state;
   };
 
   // The maxiumum result size from simple GL get commands.
   static const size_t kMaxSizeOfSimpleResult = 16 * sizeof(uint32);  // NOLINT.
 
   // used for testing only. If more things are reseved add them here.
   static const unsigned int kStartingOffset = kMaxSizeOfSimpleResult;
 
   // Size in bytes to issue async flush for transfer buffer.
   static const unsigned int kSizeToFlush = 256 * 1024;
@@ skipping 235 matching lines @@
   // Sets the contents of a bucket as a string.
   void SetBucketAsString(uint32 bucket_id, const std::string& str);
 
   // Returns true if id is reserved.
   bool IsBufferReservedId(GLuint id);
   bool IsFramebufferReservedId(GLuint id) { return false;  }
   bool IsRenderbufferReservedId(GLuint id) { return false; }
   bool IsTextureReservedId(GLuint id) { return false; }
   bool IsVertexArrayReservedId(GLuint id) { return false; }
 
-  void BindBufferHelper(GLenum target, GLuint texture);
-  void BindFramebufferHelper(GLenum target, GLuint texture);
-  void BindRenderbufferHelper(GLenum target, GLuint texture);
-  void BindTextureHelper(GLenum target, GLuint texture);
-  void BindVertexArrayHelper(GLuint array);
+  bool BindBufferHelper(GLenum target, GLuint texture);
+  bool BindFramebufferHelper(GLenum target, GLuint texture);
+  bool BindRenderbufferHelper(GLenum target, GLuint texture);
+  bool BindTextureHelper(GLenum target, GLuint texture);
+  bool BindVertexArrayHelper(GLuint array);
 
   void DeleteBuffersHelper(GLsizei n, const GLuint* buffers);
   void DeleteFramebuffersHelper(GLsizei n, const GLuint* framebuffers);
   void DeleteRenderbuffersHelper(GLsizei n, const GLuint* renderbuffers);
   void DeleteTexturesHelper(GLsizei n, const GLuint* textures);
   bool DeleteProgramHelper(GLuint program);
   bool DeleteShaderHelper(GLuint shader);
   void DeleteQueriesEXTHelper(GLsizei n, const GLuint* textures);
   void DeleteVertexArraysOESHelper(GLsizei n, const GLuint* arrays);
 
@@ skipping 66 matching lines @@
   TransferBufferInterface* transfer_buffer_;
   std::string last_error_;
   DebugMarkerManager debug_marker_manager_;
   std::string this_in_hex_;
 
   std::queue<int32> swap_buffers_tokens_;
   std::queue<int32> rate_limit_tokens_;
 
   ExtensionStatus angle_pack_reverse_row_order_status;
 
-  GLCachedState gl_state_;
+  GLStaticState static_state_;
+  ClientContextState state_;
 
   // pack alignment as last set by glPixelStorei
   GLint pack_alignment_;
 
   // unpack alignment as last set by glPixelStorei
   GLint unpack_alignment_;
 
   // unpack yflip as last set by glPixelstorei
   bool unpack_flip_y_;
 
@@ skipping 10 matching lines @@
   bool pack_reverse_row_order_;
 
   scoped_array<TextureUnit> texture_units_;
 
   // 0 to gl_state_.max_combined_texture_image_units.
   GLuint active_texture_unit_;
 
   GLuint bound_framebuffer_;
   GLuint bound_renderbuffer_;
 
+  // The program in use by glUseProgram
+  GLuint current_program_;
+
   // The currently bound array buffer.
   GLuint bound_array_buffer_id_;
 
   // The currently bound element array buffer.
   GLuint bound_element_array_buffer_id_;
 
   // GL names for the buffers used to emulate client side buffers.
   GLuint client_side_array_id_;
   GLuint client_side_element_array_id_;
 
@@ skipping 72 matching lines @@
 
 inline bool GLES2Implementation::GetTexParameterivHelper(
     GLenum /* target */, GLenum /* pname */, GLint* /* params */) {
   return false;
 }
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_