More work in Command Buffers...

command_buffer/service/win/d3d9/d3d9_utils.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 97 matching lines @@
 }
 
 static bool D3DSemanticToCBSemantic(
     D3DDECLUSAGE semantic,
     unsigned int semantic_index,
     vertex_struct::Semantic *out_semantic,
     unsigned int *out_semantic_index) {
   // TODO: what meaning do we really want to put to our semantics ? How
   // do they match the semantics that are set in the effect ? What combination
   // of (semantic, index) are supposed to work ?
+  // TODO(gman): This is just plain wrong! Fix it. Converting binormal to
+  // texcoord 7 means there will be conflicts if I have both a Binormal and a
+  // texcoord 7 or 2 binormals both of which we have examples of already in O3D!
   switch (semantic) {
     case D3DDECLUSAGE_POSITION:
       if (semantic_index != 0) return false;
-      *out_semantic = vertex_struct::POSITION;
+      *out_semantic = vertex_struct::kPosition;
       *out_semantic_index = 0;
       return true;
     case D3DDECLUSAGE_NORMAL:
       if (semantic_index != 0) return false;
-      *out_semantic = vertex_struct::NORMAL;
+      *out_semantic = vertex_struct::kNormal;
       *out_semantic_index = 0;
       return true;
     case D3DDECLUSAGE_TANGENT:
       if (semantic_index != 0) return false;
-      *out_semantic = vertex_struct::TEX_COORD;
+      *out_semantic = vertex_struct::kTexCoord;
       *out_semantic_index = 6;
       return true;
     case D3DDECLUSAGE_BINORMAL:
       if (semantic_index != 0) return false;
-      *out_semantic = vertex_struct::TEX_COORD;
+      *out_semantic = vertex_struct::kTexCoord;
       *out_semantic_index = 7;
       return true;
     case D3DDECLUSAGE_COLOR:
       if (semantic_index > 1) return false;
-      *out_semantic = vertex_struct::COLOR;
+      *out_semantic = vertex_struct::kColor;
       *out_semantic_index = semantic_index;
       return true;
     case D3DDECLUSAGE_TEXCOORD:
-      *out_semantic = vertex_struct::TEX_COORD;
+      *out_semantic = vertex_struct::kTexCoord;
       *out_semantic_index = semantic_index;
       return true;
     default:
       return false;
   }
 }
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_D3D9_UTILS_H_