More work in Command Buffers...

command_buffer/service/win/d3d9/geometry_d3d9.cc

Index: command_buffer/service/win/d3d9/geometry_d3d9.cc
===================================================================
--- command_buffer/service/win/d3d9/geometry_d3d9.cc	(revision 26886)
+++ command_buffer/service/win/d3d9/geometry_d3d9.cc	(working copy)
@@ -55,7 +55,7 @@
 void VertexBufferD3D9::Create(GAPID3D9 *gapi) {
   DCHECK(d3d_vertex_buffer_ == NULL);
 
-  DWORD d3d_usage = (flags() & vertex_buffer::DYNAMIC) ? D3DUSAGE_DYNAMIC : 0;
+  DWORD d3d_usage = (flags() & vertex_buffer::kDynamic) ? D3DUSAGE_DYNAMIC : 0;
   D3DPOOL d3d_pool = D3DPOOL_MANAGED;
   HR(gapi->d3d_device()->CreateVertexBuffer(size(), d3d_usage, 0, d3d_pool,
                                             &d3d_vertex_buffer_, NULL));
@@ -78,7 +78,7 @@
   // If we are setting the full buffer, discard the old data. That's only
   // possible to do for a dynamic d3d vertex buffer.
   if ((offset == 0) && (size == this->size()) &&
-      (flags() & vertex_buffer::DYNAMIC))
+      (flags() & vertex_buffer::kDynamic))
     lock_flags = D3DLOCK_DISCARD;
   HR(d3d_vertex_buffer_->Lock(offset, size, &ptr, lock_flags));
   memcpy(ptr, data, size);
@@ -119,9 +119,9 @@
 void IndexBufferD3D9::Create(GAPID3D9 *gapi) {
   DCHECK(d3d_index_buffer_ == NULL);
 
-  DWORD d3d_usage = (flags() & index_buffer::DYNAMIC) ? D3DUSAGE_DYNAMIC : 0;
+  DWORD d3d_usage = (flags() & index_buffer::kDynamic) ? D3DUSAGE_DYNAMIC : 0;
   D3DFORMAT d3d_format =
-      (flags() & index_buffer::INDEX_32BIT) ? D3DFMT_INDEX32 : D3DFMT_INDEX16;
+      (flags() & index_buffer::kIndex32Bit) ? D3DFMT_INDEX32 : D3DFMT_INDEX16;
   D3DPOOL d3d_pool = D3DPOOL_MANAGED;
   HR(gapi->d3d_device()->CreateIndexBuffer(size(), d3d_usage, d3d_format,
                                            d3d_pool, &d3d_index_buffer_,
@@ -145,7 +145,7 @@
   // If we are setting the full buffer, discard the old data. That's only
   // possible to do for a dynamic d3d index buffer.
   if ((offset == 0) && (size == this->size()) &&
-      (flags() & index_buffer::DYNAMIC))
+      (flags() & index_buffer::kDynamic))
     lock_flags = D3DLOCK_DISCARD;
   HR(d3d_index_buffer_->Lock(offset, size, &ptr, lock_flags));
   memcpy(ptr, data, size);
@@ -175,7 +175,7 @@
 
 // Sets the input element in the VertexStruct resource.
 void VertexStructD3D9::SetInput(unsigned int input_index,
-                                ResourceID vertex_buffer_id,
+                                ResourceId vertex_buffer_id,
                                 unsigned int offset,
                                 unsigned int stride,
                                 vertex_struct::Type type,
@@ -222,17 +222,17 @@
 // Converts a vertex_struct::Type to a D3DDECLTYPE.
 static D3DDECLTYPE D3DType(vertex_struct::Type type) {
   switch (type) {
-    case vertex_struct::FLOAT1:
+    case vertex_struct::kFloat1:
       return D3DDECLTYPE_FLOAT1;
-    case vertex_struct::FLOAT2:
+    case vertex_struct::kFloat2:
       return D3DDECLTYPE_FLOAT2;
-    case vertex_struct::FLOAT3:
+    case vertex_struct::kFloat3:
       return D3DDECLTYPE_FLOAT3;
-    case vertex_struct::FLOAT4:
+    case vertex_struct::kFloat4:
       return D3DDECLTYPE_FLOAT4;
-    case vertex_struct::UCHAR4N:
+    case vertex_struct::kUChar4N:
       return D3DDECLTYPE_UBYTE4N;
-    case vertex_struct::NUM_TYPES:
+    case vertex_struct::kNumTypes:
       break;
   }
   LOG(FATAL) << "Invalid type";
@@ -242,15 +242,15 @@
 // Converts a vertex_struct::Semantic to a D3DDECLUSAGE.
 static D3DDECLUSAGE D3DUsage(vertex_struct::Semantic semantic) {
   switch (semantic) {
-    case vertex_struct::POSITION:
+    case vertex_struct::kPosition:
       return D3DDECLUSAGE_POSITION;
-    case vertex_struct::NORMAL:
+    case vertex_struct::kNormal:
       return D3DDECLUSAGE_NORMAL;
-    case vertex_struct::COLOR:
+    case vertex_struct::kColor:
       return D3DDECLUSAGE_COLOR;
-    case vertex_struct::TEX_COORD:
+    case vertex_struct::kTexCoord:
       return D3DDECLUSAGE_TEXCOORD;
-    case vertex_struct::NUM_SEMANTICS:
+    case vertex_struct::kNumSemantics:
       break;
   }
   LOG(FATAL) << "Invalid type";
@@ -310,7 +310,7 @@
 
 // Creates and assigns a VertexBufferD3D9 resource.
 BufferSyncInterface::ParseError GAPID3D9::CreateVertexBuffer(
-    ResourceID id,
+    ResourceId id,
     unsigned int size,
     unsigned int flags) {
   VertexBufferD3D9 *vertex_buffer = new VertexBufferD3D9(size, flags);
@@ -320,7 +320,7 @@
 }
 
 // Destroys a VertexBufferD3D9 resource.
-BufferSyncInterface::ParseError GAPID3D9::DestroyVertexBuffer(ResourceID id) {
+BufferSyncInterface::ParseError GAPID3D9::DestroyVertexBuffer(ResourceId id) {
   return vertex_buffers_.Destroy(id) ?
       BufferSyncInterface::kParseNoError :
       BufferSyncInterface::kParseInvalidArguments;
@@ -328,7 +328,7 @@
 
 // Copies the data into the VertexBufferD3D9 resource.
 BufferSyncInterface::ParseError GAPID3D9::SetVertexBufferData(
-    ResourceID id,
+    ResourceId id,
     unsigned int offset,
     unsigned int size,
     const void *data) {
@@ -341,7 +341,7 @@
 
 // Copies the data from the VertexBufferD3D9 resource.
 BufferSyncInterface::ParseError GAPID3D9::GetVertexBufferData(
-    ResourceID id,
+    ResourceId id,
     unsigned int offset,
     unsigned int size,
     void *data) {
@@ -354,7 +354,7 @@
 
 // Creates and assigns an IndexBufferD3D9 resource.
 BufferSyncInterface::ParseError GAPID3D9::CreateIndexBuffer(
-    ResourceID id,
+    ResourceId id,
     unsigned int size,
     unsigned int flags) {
   IndexBufferD3D9 *index_buffer = new IndexBufferD3D9(size, flags);
@@ -364,7 +364,7 @@
 }
 
 // Destroys an IndexBufferD3D9 resource.
-BufferSyncInterface::ParseError GAPID3D9::DestroyIndexBuffer(ResourceID id) {
+BufferSyncInterface::ParseError GAPID3D9::DestroyIndexBuffer(ResourceId id) {
   return index_buffers_.Destroy(id) ?
       BufferSyncInterface::kParseNoError :
       BufferSyncInterface::kParseInvalidArguments;
@@ -372,7 +372,7 @@
 
 // Copies the data into the IndexBufferD3D9 resource.
 BufferSyncInterface::ParseError GAPID3D9::SetIndexBufferData(
-    ResourceID id,
+    ResourceId id,
     unsigned int offset,
     unsigned int size,
     const void *data) {
@@ -385,7 +385,7 @@
 
 // Copies the data from the IndexBufferD3D9 resource.
 BufferSyncInterface::ParseError GAPID3D9::GetIndexBufferData(
-    ResourceID id,
+    ResourceId id,
     unsigned int offset,
     unsigned int size,
     void *data) {
@@ -398,7 +398,7 @@
 
 // Creates and assigns a VertexStructD3D9 resource.
 BufferSyncInterface::ParseError GAPID3D9::CreateVertexStruct(
-    ResourceID id, unsigned int input_count) {
+    ResourceId id, unsigned int input_count) {
   if (id == current_vertex_struct_) validate_streams_ = true;
   VertexStructD3D9 *vertex_struct = new VertexStructD3D9(input_count);
   vertex_structs_.Assign(id, vertex_struct);
@@ -406,7 +406,7 @@
 }
 
 // Destroys a VertexStructD3D9 resource.
-BufferSyncInterface::ParseError GAPID3D9::DestroyVertexStruct(ResourceID id) {
+BufferSyncInterface::ParseError GAPID3D9::DestroyVertexStruct(ResourceId id) {
   if (id == current_vertex_struct_) validate_streams_ = true;
   return vertex_structs_.Destroy(id) ?
       BufferSyncInterface::kParseNoError :
@@ -415,9 +415,9 @@
 
 // Sets an input into a VertexStructD3D9 resource.
 BufferSyncInterface::ParseError GAPID3D9::SetVertexInput(
-    ResourceID vertex_struct_id,
+    ResourceId vertex_struct_id,
     unsigned int input_index,
-    ResourceID vertex_buffer_id,
+    ResourceId vertex_buffer_id,
     unsigned int offset,
     unsigned int stride,
     vertex_struct::Type type,