More work in Command Buffers...

core/cross/command_buffer/primitive_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 "core/cross/command_buffer/effect_cb.h"
 #include "core/cross/command_buffer/stream_bank_cb.h"
 #include "core/cross/error.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;
 
 PrimitiveCB::PrimitiveCB(ServiceLocator* service_locator, RendererCB *renderer)
     : Primitive(service_locator),
       renderer_(renderer) {
 }
 
 PrimitiveCB::~PrimitiveCB() {
 }
 
 // Converts an O3D primitive type to a command-buffer one.
-static GAPIInterface::PrimitiveType GetCBPrimitiveType(
+static command_buffer::PrimitiveType GetCBPrimitiveType(
     Primitive::PrimitiveType primitive_type) {
   switch (primitive_type) {
     case Primitive::LINELIST:
-      return GAPIInterface::LINES;
+      return command_buffer::kLines;
     case Primitive::LINESTRIP:
-      return GAPIInterface::LINE_STRIPS;
+      return command_buffer::kLineStrips;
     case Primitive::TRIANGLELIST:
-      return GAPIInterface::TRIANGLES;
+      return command_buffer::kTriangles;
     case Primitive::TRIANGLESTRIP:
-      return GAPIInterface::TRIANGLE_STRIPS;
+      return command_buffer::kTriangleStrips;
     case Primitive::TRIANGLEFAN:
-      return GAPIInterface::TRIANGLE_FANS;
+      return command_buffer::kTriangleFans;
     default:
       // Note that POINTLIST falls into this case, for compatibility with D3D.
-      return GAPIInterface::MAX_PRIMITIVE_TYPE;
+      return command_buffer::kMaxPrimitiveType;
   }
 }
 
 // Sends the draw commands to the command buffers.
 void PrimitiveCB::PlatformSpecificRender(Renderer* renderer,
                                          DrawElement* draw_element,
                                          Material* material,
                                          ParamObject* override,
                                          ParamCache* param_cache) {
   DLOG_ASSERT(draw_element);
@@ skipping 17 matching lines @@
     // InsertMissingVertexStreams();
   }
 
   IndexBufferCB *index_buffer_cb =
       down_cast<IndexBufferCB *>(index_buffer());
   if (!index_buffer_cb) {
     // TODO(gman): draw non-indexed primitives.
     DLOG(INFO) << "Trying to draw with an empty index buffer.";
     return;
   }
-  GAPIInterface::PrimitiveType cb_primitive_type =
+  command_buffer::PrimitiveType cb_primitive_type =
       GetCBPrimitiveType(primitive_type_);
-  if (cb_primitive_type == GAPIInterface::MAX_PRIMITIVE_TYPE) {
+  if (cb_primitive_type == command_buffer::kMaxPrimitiveType) {
     DLOG(INFO) << "Invalid primitive type (" << primitive_type_ << ").";
     return;
   }
 
   // Make sure our streams are up to date (skinned, etc..)
   stream_bank_cb->UpdateStreams();
 
   stream_bank_cb->BindStreamsForRendering();
 
   CommandBufferHelper *helper = renderer_->helper();
 
   // Sets current effect.
   // TODO: cache current effect ?
   helper->SetEffect(effect_cb->resource_id());
   param_cache_cb->RunHandlers(helper);
 
   // Draws.
   helper->DrawIndexed(cb_primitive_type, index_buffer_cb->resource_id(),
                        0, number_primitives_, 0, number_vertices_ - 1);
 }
 
 }  // namespace o3d