More work in Command Buffers...

command_buffer/service/cross/resource.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 85 matching lines @@
   unsigned int flags_;
  private:
   DISALLOW_COPY_AND_ASSIGN(IndexBuffer);
 };
 
 // VertexStruct class, representing a vertex struct resource.
 class VertexStruct: public Resource {
  public:
   // The representation of an input data stream.
   struct Element {
-    ResourceID vertex_buffer;
+    ResourceId vertex_buffer;
     unsigned int offset;
     unsigned int stride;
     vertex_struct::Type type;
     vertex_struct::Semantic semantic;
     unsigned int semantic_index;
   };
 
   explicit VertexStruct(unsigned int count)
       : count_(count),
         elements_(new Element[count]) {
@@ skipping 98 matching lines @@
 // Base of ResourceMap. Contains most of the implementation of ResourceMap, to
 // avoid template bloat.
 class ResourceMapBase {
  public:
   ResourceMapBase() : resources_() {}
   ~ResourceMapBase() {}
 
   // Assigns a resource to a resource ID. Assigning a resource to an ID that
   // already has an existing resource will destroy that existing resource. The
   // map takes ownership of the resource.
-  void Assign(ResourceID id, Resource* resource);
+  void Assign(ResourceId id, Resource* resource);
   // Destroys a resource.
-  bool Destroy(ResourceID id);
+  bool Destroy(ResourceId id);
   // Destroy all resources.
   void DestroyAllResources();
   // Gets a resource by ID.
-  Resource *Get(ResourceID id) {
+  Resource *Get(ResourceId id) {
     return (id < resources_.size()) ? resources_[id] : NULL;
   }
  private:
   typedef std::vector<Resource *> Container;
   Container resources_;
 };
 
 // Resource Map class, allowing resource ID <-> Resource association. This is a
 // dense map, optimized for retrieval (O(1)).
 template<class T> class ResourceMap {
  public:
   ResourceMap() : container_() {}
   ~ResourceMap() {}
 
   // Assigns a resource to a resource ID. Assigning a resource to an ID that
   // already has an existing resource will destroy that existing resource. The
   // map takes ownership of the resource.
-  void Assign(ResourceID id, T* resource) {
+  void Assign(ResourceId id, T* resource) {
     container_.Assign(id, resource);
   }
   // Destroys a resource.
-  bool Destroy(ResourceID id) {
+  bool Destroy(ResourceId id) {
     return container_.Destroy(id);
   }
   // Destroy all resources.
   void DestroyAllResources() {
     return container_.DestroyAllResources();
   }
   // Gets a resource by ID.
-  T *Get(ResourceID id) {
+  T *Get(ResourceId id) {
     return down_cast<T*>(container_.Get(id));
   }
  private:
   ResourceMapBase container_;
 };
 
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_CROSS_RESOURCE_H_