More work in Command Buffers...

command_buffer/service/win/d3d9/geometry_d3d9.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 81 matching lines @@
 // D3D9 version of VertexStruct.
 class VertexStructD3D9 : public VertexStruct {
  public:
   explicit VertexStructD3D9(unsigned int count)
       : VertexStruct(count),
         dirty_(true),
         d3d_vertex_decl_(NULL) {}
   virtual ~VertexStructD3D9();
   // Adds an input to the vertex struct.
   void SetInput(unsigned int input_index,
-                ResourceID vertex_buffer_id,
+                ResourceId vertex_buffer_id,
                 unsigned int offset,
                 unsigned int stride,
                 vertex_struct::Type type,
                 vertex_struct::Semantic semantic,
                 unsigned int semantic_index);
   // Sets the input streams to D3D.
   unsigned int SetStreams(GAPID3D9 *gapi);
  private:
   // Destroys the vertex declaration and stream map.
   void Destroy();
   // Compiles the vertex declaration and stream map.
   void Compile(IDirect3DDevice9 *d3d_device);
 
   bool dirty_;
-  typedef std::pair<ResourceID, unsigned int> StreamPair;
+  typedef std::pair<ResourceId, unsigned int> StreamPair;
   std::vector<StreamPair> streams_;
   IDirect3DVertexDeclaration9 *d3d_vertex_decl_;
   DISALLOW_COPY_AND_ASSIGN(VertexStructD3D9);
 };
 
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_GEOMETRY_D3D9_H_