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/gles2_cmd_helper.h"
 #include "../client/gles2_interface.h"
+#include "../client/gpu_memory_buffer_tracker.h"
+#include "../client/image_factory.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"
 
 #if !defined(NDEBUG) && !defined(__native_client__) && !defined(GLES2_CONFORMANCE_TESTS)  // NOLINT
@@ skipping 181 matching lines @@
   void FreeEverything();
 
   void SetErrorMessageCallback(ErrorMessageCallback* callback) {
     error_message_callback_ = callback;
   }
 
   ShareGroup* share_group() const {
     return share_group_.get();
   }
 
+  // GLES2Implementation owns the |factory|.
+  void SetImageFactory(scoped_ptr<ImageFactory> factory) {

[reveman, 2013/05/10 02:06:16]

Changing the ImageFactory during the lifetime of a GLES2Implementation seem bad.
Can you pass this to the constructor instead?

[kaanb, 2013/05/13 23:00:36]

Done.

+    image_factory_ = factory.Pass();
+  }
+
+  // GLES2Implementation owns the |tracker|.

[no sievers, 2013/05/10 01:21:51]

nit: maybe put 'for testing' here?

Because it seems there should always be only one kind of tracker in the real
world.

[kaanb, 2013/05/13 23:00:36]

Removed this method.

+  void SetGpuMemoryBufferTracker(scoped_ptr<GpuMemoryBufferTracker> tracker) {
+    gpu_memory_buffer_tracker_ = tracker.Pass();
+  }
+
  private:
   friend class GLES2ImplementationTest;
   friend class VertexArrayObjectManager;
 
   // Used to track whether an extension is available
   enum ExtensionStatus {
       kAvailableExtensionStatus,
       kUnavailableExtensionStatus,
       kUnknownExtensionStatus
   };
@@ skipping 168 matching lines @@
   bool BindRenderbufferHelper(GLenum target, GLuint texture);
   bool BindTextureHelper(GLenum target, GLuint texture);
   bool 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 GenImageBuffersHelper(GLsizei n, const GLuint* imagebuffers);

[no sievers, 2013/05/10 01:21:51]

not used or defined?

[kaanb, 2013/05/13 23:00:36]

Removed.

 
   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* 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);
 
+  GLuint CreateImageCHROMIUMHelper(GLsizei width, GLsizei height);
+  void DestroyImageCHROMIUMHelper(GLuint image_id);
+  void* MapImageCHROMIUMHelper(GLuint image_id, GLenum access);
+  GLboolean UnmapImageCHROMIUMHelper(GLuint image_id);
+  void GetImageParameterivCHROMIUMHelper(
+      GLuint image_id, GLenum pname, GLint* params);
+
   // 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 145 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_;
 
+  scoped_ptr<ImageFactory> image_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(GLES2Implementation);
 };
 
 inline bool GLES2Implementation::GetBufferParameterivHelper(
     GLenum /* target */, GLenum /* pname */, GLint* /* params */) {
   return false;
 }
 
 inline bool GLES2Implementation::GetFramebufferAttachmentParameterivHelper(
     GLenum /* target */,
@@ skipping 20 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_