GPU client side changes for GpuMemoryBuffers

gpu/command_buffer/client/gles2_implementation.h

Index: gpu/command_buffer/client/gles2_implementation.h
diff --git a/gpu/command_buffer/client/gles2_implementation.h b/gpu/command_buffer/client/gles2_implementation.h
index e176c8b20a2ca761346d004833caa93ba7ccc452..091317cb59ac57fdcbb7e659f17ea46bb0d58bb0 100644
--- a/gpu/command_buffer/client/gles2_implementation.h
+++ b/gpu/command_buffer/client/gles2_implementation.h
@@ -16,6 +16,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "../client/buffer_tracker.h"
 #include "../client/client_context_state.h"
+#include "../client/gpu_memory_buffer_tracker.h"

[greggman, 2013/04/25 23:45:34]

Can you just forward declare GPUMemoryBufferTracker?

Looks like some of the other trackers/manager should change to using forward
declarations as well. I think some of them used to be instances instead of
scoped_ptr

[kaanb1, 2013/04/26 03:01:21]

Done for gpu_memory_buffer_tracker but we need buffer_tracker.h for the
definition of the BufferTracker::Buffer subclass.

 #include "../client/gles2_cmd_helper.h"
 #include "../client/gles2_interface.h"
 #include "../client/query_tracker.h"
@@ -435,6 +436,10 @@ class GLES2_IMPL_EXPORT GLES2Implementation : public GLES2Interface {
       GLenum target, GLintptr offset, GLsizeiptr size, const void* data,
       ScopedTransferBufferPtr* buffer);
 
+  // Helper for ImageBufferData
+  void ImageBufferDataHelperCHROMIUM(
+      GLenum target, GLsizei width, GLsizei height);
+
   // Helper for GetVertexAttrib
   bool GetVertexAttribHelper(GLuint index, GLenum pname, uint32* param);
 
@@ -498,6 +503,9 @@ class GLES2_IMPL_EXPORT GLES2Implementation : public GLES2Interface {
   void FailGLError(GLenum /* error */) { }
 #endif
 
+  bool GetBoundGpuMemoryBuffer(const char* function_name, GLuint* buffer_id);
+  void* GetNativeHandleForBoundGpuMemoryBuffer();
+
   GLES2Util util_;
   GLES2CmdHelper* helper_;
   TransferBufferInterface* transfer_buffer_;
@@ -554,6 +562,9 @@ class GLES2_IMPL_EXPORT GLES2Implementation : public GLES2Interface {
   GLuint bound_pixel_pack_transfer_buffer_id_;
   GLuint bound_pixel_unpack_transfer_buffer_id_;
 
+  // The currently bound GPU memory buffer
+  GLuint bound_gpu_memory_buffer_id_;
+
   // Client side management for vertex array objects. Needed to correctly
   // track client side arrays.
   scoped_ptr<VertexArrayObjectManager> vertex_array_object_manager_;
@@ -600,6 +611,8 @@ class GLES2_IMPL_EXPORT GLES2Implementation : public GLES2Interface {
 
   scoped_ptr<BufferTracker> buffer_tracker_;
 
+  scoped_ptr<GpuMemoryBufferTracker> gpu_memory_buffer_tracker_;
+
   ErrorMessageCallback* error_message_callback_;
 
   scoped_ptr<std::string> current_trace_name_;