Fix VAOs and client side arrays

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>
@@ skipping 76 matching lines @@
 struct GLUniformDefinitionCHROMIUM;
 
 namespace gpu {
 
 class MappedMemoryManager;
 class ScopedTransferBufferPtr;
 class TransferBufferInterface;
 
 namespace gles2 {
 
-class ClientSideBufferHelper;
+class VertexArrayObjectManager;
 
 // This class emulates GLES2 over command buffers. It can be used by a client
 // program so that the program does not need deal with shared memory and command
 // buffer management. See gl2_lib.h.  Note that there is a performance gain to
 // be had by changing your code to use command buffers directly by using the
 // 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 {
@@ skipping 97 matching lines @@
 
   void SetErrorMessageCallback(ErrorMessageCallback* callback) {
     error_message_callback_ = callback;
   }
 
   ShareGroup* share_group() const {
     return share_group_.get();
   }
 
  private:
-  friend class ClientSideBufferHelper;
   friend class GLES2ImplementationTest;
+  friend class VertexArrayObjectManager;
 
   // Used to track whether an extension is available
   enum ExtensionStatus {
       kAvailableExtensionStatus,
       kUnavailableExtensionStatus,
       kUnknownExtensionStatus
   };
 
   // Base class for mapped resources.
   struct MappedResource {
@@ skipping 155 matching lines @@
   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);
 
+  void GenBuffersHelper(GLsizei n, const GLuint* buffers);
+  void GenFramebuffersHelper(GLsizei n, const GLuint* framebuffers);
+  void GenRenderbuffersHelper(GLsizei n, const GLuint* renderbuffers);
+  void GenTexturesHelper(GLsizei n, const GLuint* textures);
+  void GenVertexArraysOESHelper(GLsizei n, const GLuint* arrays);
+  void GenQueriesEXTHelper(GLsizei n, const GLuint* queries);
+
   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 DeleteQueriesEXTHelper(GLsizei n, const GLuint* queries);
   void DeleteVertexArraysOESHelper(GLsizei n, const GLuint* arrays);
 
   void DeleteBuffersStub(GLsizei n, const GLuint* buffers);
   void DeleteFramebuffersStub(GLsizei n, const GLuint* framebuffers);
   void DeleteRenderbuffersStub(GLsizei n, const GLuint* renderbuffers);
   void DeleteTexturesStub(GLsizei n, const GLuint* textures);
   void DeleteProgramStub(GLsizei n, const GLuint* programs);
   void DeleteShaderStub(GLsizei n, const GLuint* shaders);
   // TODO(gman): Remove this as queries are not shared.
   void DeleteQueriesStub(GLsizei n, const GLuint* queries);
   void DeleteVertexArraysOESStub(GLsizei n, const GLuint* arrays);
 
   void BufferDataHelper(
       GLenum target, GLsizeiptr size, const void* data, GLenum usage);
   void BufferSubDataHelper(
       GLenum target, GLintptr offset, GLsizeiptr size, const void* data);
   void BufferSubDataHelperImpl(
       GLenum target, GLintptr offset, GLsizeiptr size, const void* data,
       ScopedTransferBufferPtr* buffer);
 
   // Helper for GetVertexAttrib
   bool GetVertexAttribHelper(GLuint index, GLenum pname, uint32* param);
 
   GLuint GetMaxValueInBufferCHROMIUMHelper(
       GLuint buffer_id, GLsizei count, GLenum type, GLuint offset);
 
+  void RestoreElementAndArrayBuffers(bool restore);
+  void RestoreArrayBuffer(bool restrore);
+
   // The pixels pointer should already account for unpack skip rows and skip
   // pixels.
   void TexSubImage2DImpl(
       GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
       GLsizei height, GLenum format, GLenum type, uint32 unpadded_row_size,
       const void* pixels, uint32 pixels_padded_row_size, GLboolean internal,
       ScopedTransferBufferPtr* buffer, uint32 buffer_padded_row_size);
 
   // Helpers for query functions.
   bool GetHelper(GLenum pname, GLint* params);
@@ skipping 70 matching lines @@
 
   // 0 to gl_state_.max_combined_texture_image_units.
   GLuint active_texture_unit_;
 
   GLuint bound_framebuffer_;
   GLuint bound_renderbuffer_;
 
   // The currently bound array buffer.
   GLuint bound_array_buffer_id_;
 
-  // The currently bound element array buffer.
-  GLuint bound_element_array_buffer_id_;
-
   // The currently bound pixel transfer buffer.
   GLuint bound_pixel_unpack_transfer_buffer_id_;
 
-  // GL names for the buffers used to emulate client side buffers.
-  GLuint client_side_array_id_;
-  GLuint client_side_element_array_id_;
-
-  // Info for each vertex attribute saved so we can simulate client side
-  // buffers.
-  scoped_ptr<ClientSideBufferHelper> client_side_buffer_helper_;
-
-  // The currently bound vertex array object (VAO)
-  GLuint bound_vertex_array_id_;
+  // Client side management for vertex array objects. Needed to correctly
+  // track client side arrays.
+  scoped_ptr<VertexArrayObjectManager> vertex_array_object_manager_;
 
   GLuint reserved_ids_[2];
 
   // Current GL error bits.
   uint32 error_bits_;
 
   // Whether or not to print debugging info.
   bool debug_;
 
   // Used to check for single threaded access.
@@ skipping 58 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_