Add support for GL_CHROMIUM_pixel_transfer_buffer_object.

gpu/command_buffer/service/buffer_manager.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_SERVICE_BUFFER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_BUFFER_MANAGER_H_
 
 #include <map>
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
+
+class CommonDecoder;
+
 namespace gles2 {
 
 // This class keeps track of the buffers and their sizes so we can do
 // bounds checking.
 //
 // NOTE: To support shared resources an instance of this class will need to be
 // shared by multiple GLES2Decoders.
 class GPU_EXPORT BufferManager {
  public:
   // Info about Buffers currently in the system.
@@ skipping 84 matching lines @@
 
     bool shadowed() const {
       return shadowed_;
     }
 
     void MarkAsDeleted() {
       deleted_ = true;
     }
 
     void SetInfo(GLsizeiptr size, GLenum usage, bool shadow);
+    void SetInfo(GLsizeiptr size, GLenum usage, CommonDecoder* decoder,
+                 int32 shm_id, uint32 shm_offset);
 
     // Clears any cache of index ranges.
     void ClearCache();
 
     // The manager that owns this BufferInfo.
     BufferManager* manager_;
 
     // True if deleted.
     bool deleted_;
 
@@ skipping 14 matching lines @@
     // Whether or not the data is shadowed.
     bool shadowed_;
 
     // A copy of the data in the buffer. This data is only kept if the target
     // is backed_ = true.
     scoped_array<int8> shadow_;
 
     // A map of ranges to the highest value in that range of a certain type.
     typedef std::map<Range, GLuint, Range::Less> RangeToMaxValueMap;
     RangeToMaxValueMap range_set_;
+
+    // The decoder pointer is reset if the decoder is destroyed.
+    base::WeakPtr<CommonDecoder> decoder_;

[greggman, 2012/05/24 20:56:00]

I'm a little leary of tracking decoders per buffer though I don't see another
way a the moment.

But, since shared contexts now have to be in the same process maybe the shared
memory management should move from CommonDecoder to some object hanging off of
ContextGroup

+
+    // The shared memory used with this Buffer.
+    int32 shm_id_;
+    uint32 shm_offset_;
   };
 
   BufferManager();
   ~BufferManager();
 
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Creates a BufferInfo for the given buffer.
   void CreateBufferInfo(GLuint client_id, GLuint service_id);
 
   // Gets the buffer info for the given buffer.
   BufferInfo* GetBufferInfo(GLuint client_id);
 
   // Removes a buffer info for the given buffer.
   void RemoveBufferInfo(GLuint client_id);
 
   // Gets a client id for a given service id.
   bool GetClientId(GLuint service_id, GLuint* client_id) const;
 
   // Sets the size and usage of a buffer.
   void SetInfo(BufferInfo* info, GLsizeiptr size, GLenum usage);
 
+  // Sets the size, usage and shared memory of a buffer.
+  void SetInfo(BufferInfo* info, GLsizeiptr size, GLenum usage,
+               CommonDecoder* decoder, int32 shm_id, uint32 shm_offset);
+
   // Sets the target of a buffer. Returns false if the target can not be set.
   bool SetTarget(BufferInfo* info, GLenum target);
 
   void set_allow_buffers_on_multiple_targets(bool allow) {
     allow_buffers_on_multiple_targets_ = allow;
   }
 
  private:
   void UpdateMemRepresented();
 
@@ skipping 16 matching lines @@
 
   bool have_context_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_BUFFER_MANAGER_H_