More work in Command Buffers...

core/cross/command_buffer/stream_bank_cb.cc

 /*
  * 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 28 matching lines @@
 #include "core/cross/command_buffer/buffer_cb.h"
 #include "core/cross/command_buffer/effect_cb.h"
 #include "core/cross/command_buffer/stream_bank_cb.h"
 #include "command_buffer/common/cross/gapi_interface.h"
 #include "command_buffer/client/cross/cmd_buffer_helper.h"
 
 // TODO: add unit tests.
 
 namespace o3d {
 
-using command_buffer::ResourceID;
+using command_buffer::ResourceId;
 using command_buffer::CommandBufferHelper;
 using command_buffer::CommandBufferEntry;
 using command_buffer::GAPIInterface;
 using command_buffer::kInvalidResource;
 namespace vertex_struct = command_buffer::vertex_struct;
 
 StreamBankCB::StreamBankCB(ServiceLocator* service_locator,
                            RendererCB *renderer)
     : StreamBank(service_locator),
       renderer_(renderer),
@@ skipping 10 matching lines @@
     Stream::Semantic 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 ?
   switch (semantic) {
     case Stream::POSITION:
       if (semantic_index != 0) return false;
-      *out_semantic = vertex_struct::POSITION;
+      *out_semantic = vertex_struct::kPosition;
       *out_semantic_index = 0;
       return true;
     case Stream::NORMAL:
       if (semantic_index != 0) return false;
-      *out_semantic = vertex_struct::NORMAL;
+      *out_semantic = vertex_struct::kNormal;
       *out_semantic_index = 0;
       return true;
     case Stream::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 Stream::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 Stream::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 Stream::TEXCOORD:
-      *out_semantic = vertex_struct::TEX_COORD;
+      *out_semantic = vertex_struct::kTexCoord;
       *out_semantic_index = semantic_index;
       return true;
     default:
       return false;
   }
 }
 
 // Converts a data type from O3D enum values to command-buffer enum values.
 static vertex_struct::Type GetCBType(const Field& field) {
   if (field.IsA(FloatField::GetApparentClass())) {
     switch (field.num_components()) {
       case 1:
-        return vertex_struct::FLOAT1;
+        return vertex_struct::kFloat1;
       case 2:
-        return vertex_struct::FLOAT2;
+        return vertex_struct::kFloat3;
       case 3:
-        return vertex_struct::FLOAT3;
+        return vertex_struct::kFloat3;
       case 4:
-        return vertex_struct::FLOAT4;
+        return vertex_struct::kFloat4;
     }
   } else if (field.IsA(UByteNField::GetApparentClass())) {
     switch (field.num_components()) {
       case 4:
-        return vertex_struct::UCHAR4N;
+        return vertex_struct::kUChar4N;
     }
   }
   DLOG(ERROR) << "Unknown Stream DataType";
-  return vertex_struct::NUM_TYPES;
+  return vertex_struct::kNumTypes;
 }
 
 // This function is overridden so that we can invalidate the vertex struct any
 // time the streams change.
 void StreamBankCB::OnUpdateStreams() {
   DestroyVertexStruct();
 }
 
 // Creates the vertex struct resource on the service side. It will only set the
 // vertex inputs if they represent semantics and types we know about. The
 // command buffer API will not draw with an incomplete vertex struct.
 // This function will get called on Draw, after any change to the vertex inputs
 // has occurred.
 void StreamBankCB::CreateVertexStruct() {
   DCHECK_EQ(kInvalidResource, vertex_struct_id_);
   vertex_struct_id_ = renderer_->vertex_structs_ids().AllocateID();
   CommandBufferHelper *helper = renderer_->helper();
   helper->CreateVertexStruct(vertex_struct_id_, vertex_stream_params_.size());
   for (unsigned int i = 0; i < vertex_stream_params_.size(); ++i) {
     const Stream &stream = vertex_stream_params_[i]->stream();
     vertex_struct::Semantic cb_semantic;
     unsigned int cb_semantic_index;
     if (!GetCBSemantic(stream.semantic(), stream.semantic_index(), &cb_semantic,
                        &cb_semantic_index)) {
       DLOG(INFO) << "Unknown semantic (" << stream.semantic() << ", "
                  << stream.semantic_index() << ") - ignoring stream.";
       continue;
     }
     vertex_struct::Type cb_type = GetCBType(stream.field());
-    if (cb_type == vertex_struct::NUM_TYPES) {
+    if (cb_type == vertex_struct::kNumTypes) {
       DLOG(INFO) << "Invalid type (" << stream.field().num_components()
                  << ") - ignoring stream.";
       continue;
     }
 
     VertexBufferCB *vertex_buffer =
         static_cast<VertexBufferCB *>(stream.field().buffer());
     helper->SetVertexInput(
         vertex_struct_id_, i,
         vertex_buffer->resource_id(),
@@ skipping 16 matching lines @@
 }
 
 void StreamBankCB::BindStreamsForRendering() {
   if (vertex_struct_id_ == kInvalidResource)
     CreateVertexStruct();
   CommandBufferHelper *helper = renderer_->helper();
   helper->SetVertexStruct(vertex_struct_id_);
 }
 
 }  // namespace o3d