Adding GetStreamInfo functionality (and passing corresponding unit test).

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 31 matching lines @@
 #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;
 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) {
 }
 
 EffectCB::~EffectCB() {
   Destroy();
@@ skipping 56 matching lines @@
     return false;
   }
   for (unsigned int i = 0; i < param_descs_.size(); ++i) {
     if (!effect_helper.GetParamStrings(&(param_descs_[i]))) {
       O3D_ERROR(service_locator())
           << "Failed to create effect parameters strings.";
       Destroy();
       return false;
     }
   }
+  if (!effect_helper.GetEffectStreams(resource_id, &stream_descs_)) {
+    O3D_ERROR(service_locator()) << "Failed to get streams.";
+    Destroy();
+    return false;
+  }
   set_source(source);
   return true;
 }
 
 void EffectCB::Destroy() {
   set_source("");
   ++generation_;
   if (resource_id_ != command_buffer::kInvalidResource) {
     CommandBufferHelper *helper = renderer_->helper();
     CommandBufferEntry args[1];
@@ skipping 55 matching lines @@
       sem_class = semantic_manager->LookupSemantic(desc.semantic);
     }
     array->push_back(EffectParameterInfo(desc.name,
                                          param_class,
                                          0,
                                          desc.semantic,
                                          sem_class));
   }
 }
 
+
+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:
+      if (semantic_index != 0) return false;
+      *out_semantic = Stream::POSITION;
+      *out_semantic_index = 0;
+      return true;
+    case vertex_struct::NORMAL:
+      if (semantic_index != 0) return false;
+      *out_semantic = Stream::NORMAL;
+      *out_semantic_index = 0;
+      return true;
+    case vertex_struct::COLOR:
+      if (semantic_index > 1) return false;
+      *out_semantic = Stream::COLOR;
+      *out_semantic_index = semantic_index;
+      return true;
+    case vertex_struct::TEX_COORD:
+      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;
+        *out_semantic_index = semantic_index;
+        return true;
+      }
+    default:
+      return false;
+  }
+}
 void EffectCB::GetStreamInfo(EffectStreamInfoArray *array) {
-  // TODO(rlp)
+  DCHECK(array);
+  array->clear();
+  for (unsigned int i = 0; i < stream_descs_.size(); ++i) {
+    Stream::Semantic semantic;
+    unsigned int semantic_index;
+    if (CBSemanticToO3DSemantic(stream_descs_[i].semantic,
+                                stream_descs_[i].semantic_index,
+                                &semantic,
+                                &semantic_index)) {
+      array->push_back(EffectStreamInfo(semantic, semantic_index));
+    }
+  }
 }
 
 }  // namespace o3d