More work in Command Buffers...

core/cross/command_buffer/buffer_cb.h

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 36 matching lines @@
 // Vertex buffer resources are allocated on the service side (into GPU-friendly
 // memory), but the client side cannot map it. So instead, data updates go
 // through a buffer in the transfer shared memory when Lock and Unlock are
 // called.
 class VertexBufferCB : public VertexBuffer {
  public:
   VertexBufferCB(ServiceLocator* service_locator, RendererCB *renderer);
   ~VertexBufferCB();
 
   // Returns the resource ID for this vertex buffer.
-  command_buffer::ResourceID resource_id() const { return resource_id_; }
+  command_buffer::ResourceId resource_id() const { return resource_id_; }
 
  protected:
   // Allocates a vertex buffer resource.
   // Parameters:
   //   size_in_bytes: the memory size of the vertex buffer.
   // Returns:
   //   true if successful.
   virtual bool ConcreteAllocate(size_t size_in_bytes);
 
   // The concrete version of Free
@@ skipping 20 matching lines @@
  private:
   // The pointer to the region in the transfer shared memory buffer when the
   // vertex buffer is locked, or NULL if it is not locked.
   void *lock_pointer_;
 
   // Whether or not data was entered into the vertex buffer, to avoid copying
   // back undefined pixels.
   bool has_data_;
 
   // The command buffer resource ID for the vertex buffer.
-  command_buffer::ResourceID resource_id_;
+  command_buffer::ResourceId resource_id_;
 
   // The renderer that created this vertex buffer.
   RendererCB *renderer_;
 };
 
 // Command-buffer version of IndexBuffer. This class manages the resources for
 // index buffers and the transfer of data.
 // Index buffer resources are allocated on the service side (into GPU-friendly
 // memory), but the client side cannot map it. So instead, data updates go
 // through a buffer in the transfer shared memory when Lock and Unlock are
 // called.
 class IndexBufferCB : public IndexBuffer {
  public:
   IndexBufferCB(ServiceLocator* service_locator, RendererCB *renderer);
   ~IndexBufferCB();
 
   // Returns the resource ID for this vertex buffer.
-  command_buffer::ResourceID resource_id() const { return resource_id_; }
+  command_buffer::ResourceId resource_id() const { return resource_id_; }
 
  protected:
   // Allocates an index buffer resource.
   // Parameters:
   //   size_in_bytes: the memory size of the index buffer.
   // Returns:
   //   true if successful.
   virtual bool ConcreteAllocate(size_t size_in_bytes);
 
   // The concrete version of Free
@@ skipping 23 matching lines @@
 
   // The pointer to the region in the transfer shared memory buffer when the
   // index buffer is locked, or NULL if it is not locked.
   void *lock_pointer_;
 
   // Whether or not data was entered into the index buffer, to avoid copying
   // back undefined pixels.
   bool has_data_;
 
   // The command buffer resource ID for the index buffer.
-  command_buffer::ResourceID resource_id_;
+  command_buffer::ResourceId resource_id_;
 
   // The renderer that created this index buffer.
   RendererCB *renderer_;
 };
 
 }  // namespace o3d
 
 #endif  // O3D_CORE_CROSS_COMMAND_BUFFER_BUFFER_CB_H_