Change command buffer client code to use structures....

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 94 matching lines @@
                                               stream_bank_cb,
                                               material,
                                               override)) {
     // TODO: should we do this here, or on the service side ?
     // InsertMissingVertexStreams();
   }
 
   IndexBufferCB *index_buffer_cb =
       down_cast<IndexBufferCB *>(index_buffer());
   if (!index_buffer_cb) {
-    // TODO: draw non-index in this case ? we don't do it currently on
-    // other platforms, so keep compatibility.
+    // TODO(gman): draw non-indexed primitives.
     DLOG(INFO) << "Trying to draw with an empty index buffer.";
     return;
   }
   GAPIInterface::PrimitiveType cb_primitive_type =
       GetCBPrimitiveType(primitive_type_);
   if (cb_primitive_type == GAPIInterface::MAX_PRIMITIVE_TYPE) {
     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();
-  CommandBufferEntry args[6];
 
   // Sets current effect.
   // TODO: cache current effect ?
-  args[0].value_uint32 = effect_cb->resource_id();
-  helper->AddCommand(command_buffer::SET_EFFECT, 1, args);
+  helper->SetEffect(effect_cb->resource_id());
   param_cache_cb->RunHandlers(helper);
 
-
   // Draws.
-  args[0].value_uint32 = cb_primitive_type;
-  args[1].value_uint32 = index_buffer_cb->resource_id();
-  args[2].value_uint32 = 0;                     // first index.
-  args[3].value_uint32 = number_primitives_;    // primitive count.
-  args[4].value_uint32 = 0;                     // min index.
-  args[5].value_uint32 = number_vertices_ - 1;  // max index.
-  helper->AddCommand(command_buffer::DRAW_INDEXED, 6, args);
+  helper->DrawIndexed(cb_primitive_type, index_buffer_cb->resource_id(),
+                       0, number_primitives_, 0, number_vertices_ - 1);
 }
 
 }  // namespace o3d