GPU client side changes for GpuMemoryBuffers

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 "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"
 #include "../client/ref_counted.h"
 #include "../client/ring_buffer.h"
 #include "../client/share_group.h"
 #include "../common/compiler_specific.h"
 #include "../common/debug_marker_manager.h"
 #include "../common/gles2_cmd_utils.h"
 #include "gles2_impl_export.h"
@@ skipping 399 matching lines @@
   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 ImageBufferData
+  void ImageBufferDataHelperCHROMIUM(
+      GLenum target, GLsizei width, GLsizei height);
+
   // 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
@@ skipping 43 matching lines @@
   const std::string& GetLogPrefix() const;
 
 #if defined(GL_CLIENT_FAIL_GL_ERRORS)
   void CheckGLError();
   void FailGLError(GLenum error);
 #else
   void CheckGLError() { }
   void FailGLError(GLenum /* error */) { }
 #endif
 
+  bool GetBoundGpuMemoryBuffer(const char* function_name, GLuint* buffer_id);
+  void* GetNativeHandleForBoundGpuMemoryBuffer();
+
   GLES2Util util_;
   GLES2CmdHelper* helper_;
   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_;
 
@@ skipping 36 matching lines @@
   // The program in use by glUseProgram
   GLuint current_program_;
 
   // The currently bound array buffer.
   GLuint bound_array_buffer_id_;
 
   // The currently bound pixel transfer buffers.
   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_;
 
   GLuint reserved_ids_[2];
 
   // Current GL error bits.
   uint32 error_bits_;
 
   // Whether or not to print debugging info.
@@ skipping 26 matching lines @@
       ShaderPrecisionCacheMap;
   ShaderPrecisionCacheMap shader_precision_cache_;
 
   scoped_refptr<ShareGroup> share_group_;
 
   scoped_ptr<QueryTracker> query_tracker_;
   QueryTracker::Query* current_query_;
 
   scoped_ptr<BufferTracker> buffer_tracker_;
 
+  scoped_ptr<GpuMemoryBufferTracker> gpu_memory_buffer_tracker_;
+
   ErrorMessageCallback* error_message_callback_;
 
   scoped_ptr<std::string> current_trace_name_;
 
   DISALLOW_COPY_AND_ASSIGN(GLES2Implementation);
 };
 
 inline bool GLES2Implementation::GetBufferParameterivHelper(
     GLenum /* target */, GLenum /* pname */, GLint* /* params */) {
   return false;
@@ skipping 24 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_