1 files changed, 133 insertions, 4 deletions

diff --git a/gpu/command_buffer/client/gles2_implementation.h b/gpu/command_buffer/client/gles2_implementation.h
index fd98686..4200458 100644
--- a/gpu/command_buffer/client/gles2_implementation.h
+++ b/gpu/command_buffer/client/gles2_implementation.h
@@ -9,13 +9,18 @@
 #include <string>
 #include <vector>
 #include "../common/gles2_cmd_utils.h"
+#include "../common/scoped_ptr.h"
 #include "../client/gles2_cmd_helper.h"
 #include "../client/id_allocator.h"
 #include "../client/fenced_allocator.h"
 
+#define GLES2_SUPPORT_CLIENT_SIDE_BUFFERS 1
+
 namespace gpu {
 namespace gles2 {
 
+class ClientSideBufferHelper;
+
 // 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
@@ -24,6 +29,22 @@ namespace gles2 {
 // shared memory and synchronization issues.
 class GLES2Implementation {
  public:
+  // 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;
+
+  // The bucket used for results. Public for testing only.
+  static const uint32 kResultBucketId = 1;
+
+  // Alignment of allocations.
+  static const unsigned int kAlignment = 4;
+
+  // GL names for the buffers used to emulate client side buffers.
+  static const GLuint kClientSideArrayId = 0xFEDCBA98u;
+  static const GLuint kClientSideElementArrayId = 0xFEDCBA99u;
+
   GLES2Implementation(
       GLES2CmdHelper* helper,
       size_t transfer_buffer_size,
@@ -43,6 +64,68 @@ class GLES2Implementation {
   // this file instead of having to edit some template or the code generator.
   #include "../client/gles2_implementation_autogen.h"
 
+  #if defined(GLES2_SUPPORT_CLIENT_SIDE_BUFFERS)
+    void BindBuffer(GLenum target, GLuint buffer);
+    void DeleteBuffers(GLsizei n, const GLuint* buffers);
+    void DisableVertexAttribArray(GLuint index);
+    void DrawArrays(GLenum mode, GLint first, GLsizei count);
+    void EnableVertexAttribArray(GLuint index);
+    void GetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params);
+    void GetVertexAttribiv(GLuint index, GLenum pname, GLint* params);
+  #else
+    void BindBuffer(GLenum target, GLuint buffer) {
+      if (IsReservedId(buffer)) {
+        SetGLError(GL_INVALID_OPERATION);
+        return;
+      }
+      if (buffer != 0) {
+        id_allocator_.MarkAsUsed(buffer);
+      }
+      helper_->BindBuffer(target, buffer);
+    }
+
+    void DeleteBuffers(GLsizei n, const GLuint* buffers) {
+      FreeIds(n, buffers);
+      helper_->DeleteBuffersImmediate(n, buffers);
+    }
+
+    void DisableVertexAttribArray(GLuint index) {
+      helper_->DisableVertexAttribArray(index);
+    }
+
+    void DrawArrays(GLenum mode, GLint first, GLsizei count) {
+      if (count < 0) {
+        SetGLError(GL_INVALID_VALUE);
+        return;
+      }
+      helper_->DrawArrays(mode, first, count);
+    }
+
+    void EnableVertexAttribArray(GLuint index) {
+      helper_->EnableVertexAttribArray(index);
+    }
+
+    void GetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params) {
+      typedef GetVertexAttribfv::Result Result;
+      Result* result = GetResultAs<Result*>();
+      result->SetNumResults(0);
+      helper_->GetVertexAttribfv(
+          index, pname, result_shm_id(), result_shm_offset());
+      WaitForCmd();
+      result->CopyResult(params);
+    }
+
+    void GetVertexAttribiv(GLuint index, GLenum pname, GLint* params) {
+      typedef GetVertexAttribiv::Result Result;
+      Result* result = GetResultAs<Result*>();
+      result->SetNumResults(0);
+      helper_->GetVertexAttribiv(
+          index, pname, result_shm_id(), result_shm_offset());
+      WaitForCmd();
+      result->CopyResult(params);
+    }
+  #endif
+
   // Makes a set of Ids for glGen___ functions.
   void MakeIds(GLsizei n, GLuint* ids);
 
@@ -50,6 +133,30 @@ class GLES2Implementation {
   void FreeIds(GLsizei n, const GLuint* ids);
 
  private:
+  // Wraps FencedAllocatorWrapper to provide aligned allocations.
+  class AlignedFencedAllocator : public FencedAllocatorWrapper {
+   public:
+    AlignedFencedAllocator(unsigned int size,
+                           CommandBufferHelper *helper,
+                           void *base)
+        : FencedAllocatorWrapper(size, helper, base) {
+    }
+
+    static unsigned int RoundToAlignment(unsigned int size) {
+      return (size + kAlignment - 1) & ~(kAlignment - 1);
+    }
+
+    // Overrriden from FencedAllocatorWrapper
+    void *Alloc(unsigned int size) {
+      return FencedAllocatorWrapper::Alloc(RoundToAlignment(size));
+    }
+
+    // Overrriden from FencedAllocatorWrapper
+    template <typename T> T *AllocTyped(unsigned int count) {
+      return static_cast<T *>(Alloc(count * sizeof(T)));
+    }
+  };
+
   // Gets the shared memory id for the result buffer.
   uint32 result_shm_id() const {
     return transfer_buffer_id_;
@@ -95,14 +202,22 @@ class GLES2Implementation {
   // Sets the contents of a bucket as a string.
   void SetBucketAsString(uint32 bucket_id, const std::string& str);
 
-  // The maxiumum result size from simple GL get commands.
-  static const size_t kMaxSizeOfSimpleResult = 16 * sizeof(uint32);  // NOLINT.
-  static const uint32 kResultBucketId = 1;
+  // Returns true if id is reserved.
+  bool IsReservedId(GLuint id);
+
+#if defined(GLES2_SUPPORT_CLIENT_SIDE_BUFFERS)
+  // Helper for GetVertexAttrib
+  bool GetVertexAttribHelper(GLuint index, GLenum pname, uint32* param);
+
+  // Asks the service for the max index in an element array buffer.
+  GLsizei GetMaxIndexInElementArrayBuffer(
+      GLuint buffer_id, GLsizei count, GLenum type, GLuint offset);
+#endif
 
   GLES2Util util_;
   GLES2CmdHelper* helper_;
   IdAllocator id_allocator_;
-  FencedAllocatorWrapper transfer_buffer_;
+  AlignedFencedAllocator transfer_buffer_;
   int transfer_buffer_id_;
   void* result_buffer_;
   uint32 result_shm_offset_;
@@ -113,6 +228,20 @@ class GLES2Implementation {
   // unpack alignment as last set by glPixelStorei
   GLint unpack_alignment_;
 
+#if defined(GLES2_SUPPORT_CLIENT_SIDE_BUFFERS)
+  // The currently bound array buffer.
+  GLuint bound_array_buffer_id_;
+
+  // The currently bound element array buffer.
+  GLuint bound_element_array_buffer_id_;
+
+  // Info for each vertex attribute saved so we can simulate client side
+  // buffers.
+  scoped_ptr<ClientSideBufferHelper> client_side_buffer_helper_;
+
+  GLuint reserved_ids_[2];
+#endif
+
   // Current GL error bits.
   uint32 error_bits_;