More work in Command Buffers...

core/cross/command_buffer/effect_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 29 matching lines @@
 #include "command_buffer/common/cross/buffer_sync_api.h"
 #include "command_buffer/common/cross/cmd_buffer_format.h"
 #include "command_buffer/client/cross/fenced_allocator.h"
 #include "command_buffer/client/cross/cmd_buffer_helper.h"
 
 namespace o3d {
 
 using command_buffer::BufferSyncInterface;
 using command_buffer::CommandBufferEntry;
 using command_buffer::CommandBufferHelper;
-using command_buffer::ResourceID;
+using command_buffer::ResourceId;
 namespace effect_param = command_buffer::effect_param;
 namespace vertex_struct = command_buffer::vertex_struct;
 
 EffectCB::EffectCB(ServiceLocator *service_locator, RendererCB *renderer)
     : Effect(service_locator),
       resource_id_(command_buffer::kInvalidResource),
       generation_(0),
       renderer_(renderer) {
 }
 
@@ skipping 21 matching lines @@
                                  << " bytes to load the effect.";
     return false;
   }
   memcpy(buffer_data, vp_main.data(), vp_main.size());
   buffer_data[vp_main.size()] = 0;
   memcpy(buffer_data + vp_main.size() + 1, fp_main.data(), fp_main.size());
   buffer_data[vp_main.size() + 1 + fp_main.size()] = 0;
   memcpy(buffer_data + vp_main.size() + 1 + fp_main.size() + 1,
          source.data(), source.size());
 
-  ResourceID resource_id = renderer_->effect_ids().AllocateID();
+  ResourceId resource_id = renderer_->effect_ids().AllocateID();
 
   CommandBufferHelper *helper = renderer_->helper();
   helper->CreateEffect(
       resource_id, source_size,
       renderer_->transfer_shm_id(),
       renderer_->allocator()->GetOffset(buffer_data));
   renderer_->allocator()->FreePendingToken(buffer_data, helper->InsertToken());
 
   // NOTE: we're calling Finish to check the command result, to see if
   // the effect has succesfully compiled.
@@ skipping 44 matching lines @@
                                renderer_->transfer_shm_id(),
                                &renderer_->effect_param_ids());
     effect_helper.DestroyEffectParameters(param_descs_);
     param_descs_.clear();
   }
 }
 
 static const ObjectBase::Class* CBTypeToParamType(
     effect_param::DataType type) {
   switch (type) {
-    case effect_param::FLOAT1:
+    case effect_param::kFloat1:
       return ParamFloat::GetApparentClass();
-    case effect_param::FLOAT2:
+    case effect_param::kFloat2:
       return ParamFloat2::GetApparentClass();
-    case effect_param::FLOAT3:
+    case effect_param::kFloat3:
       return ParamFloat3::GetApparentClass();
-    case effect_param::FLOAT4:
+    case effect_param::kFloat4:
       return ParamFloat4::GetApparentClass();
-    case effect_param::INT:
+    case effect_param::kInt:
       return ParamInteger::GetApparentClass();
-    case effect_param::MATRIX4:
+    case effect_param::kMatrix4:
       return ParamMatrix4::GetApparentClass();
-    case effect_param::SAMPLER:
+    case effect_param::kSampler:
       return ParamSampler::GetApparentClass();
-    case effect_param::TEXTURE:
+    case effect_param::kTexture:
       return ParamTexture::GetApparentClass();
     default : {
       DLOG(ERROR) << "Cannot convert command buffer type "
                   << type
                   << " to a Param type.";
       return NULL;
     }
   }
 }
 
@@ skipping 20 matching lines @@
   }
 }
 
 
 static bool CBSemanticToO3DSemantic(
     vertex_struct::Semantic semantic,
     unsigned int semantic_index,
     Stream::Semantic *out_semantic,
     unsigned int *out_semantic_index) {
   switch (semantic) {
-    case vertex_struct::POSITION:
+    case vertex_struct::kPosition:
       if (semantic_index != 0) return false;
       *out_semantic = Stream::POSITION;
       *out_semantic_index = 0;
       return true;
-    case vertex_struct::NORMAL:
+    case vertex_struct::kNormal:
       if (semantic_index != 0) return false;
       *out_semantic = Stream::NORMAL;
       *out_semantic_index = 0;
       return true;
-    case vertex_struct::COLOR:
+    case vertex_struct::kColor:
       if (semantic_index > 1) return false;
       *out_semantic = Stream::COLOR;
       *out_semantic_index = semantic_index;
       return true;
-    case vertex_struct::TEX_COORD:
+    case vertex_struct::kTexCoord:
       if (semantic_index == 6) {
         *out_semantic = Stream::TANGENT;
         *out_semantic_index = 0;
         return true;
       } else if (semantic_index == 7) {
         *out_semantic = Stream::BINORMAL;
         *out_semantic_index = 0;
         return true;
       } else {
         *out_semantic = Stream::TEXCOORD;
@@ skipping 13 matching lines @@
     if (CBSemanticToO3DSemantic(stream_descs_[i].semantic,
                                 stream_descs_[i].semantic_index,
                                 &semantic,
                                 &semantic_index)) {
       array->push_back(EffectStreamInfo(semantic, semantic_index));
     }
   }
 }
 
 }  // namespace o3d