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

core/cross/command_buffer/param_cache_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 52 matching lines @@
  public:
   TypedParamHandlerCB(T* param, ResourceID id)
       : param_(param),
         id_(id) {
   }
 
   // Sends the param value to the service.
   // This template definition only works for value types (floatn, matrix, int,
   // ..., but not textures or samplers).
   virtual void SetValue(CommandBufferHelper *helper) {
-    static const unsigned int kEntryCount =
-        (sizeof(typename T::DataType) + 3) / 4;
-    CommandBufferEntry args[2 + kEntryCount];
     typename T::DataType value = param_->value();
-    args[0].value_uint32 = id_;
-    args[1].value_uint32 = sizeof(value);
-    memcpy(args + 2, &value, sizeof(value));
-    helper->AddCommand(command_buffer::SET_PARAM_DATA_IMMEDIATE,
-                       2 + kEntryCount, args);
+    helper->SetParamDataImmediate(id_, sizeof(value), &value);
   }
  private:
   T* param_;
   ResourceID id_;
 };
 
 // Matrices are expected in row major order in the command buffer, so
 // TypedParamHandlerCB<ParamMatrix4> works for row major, and we make a new
 // class for column major.
 typedef TypedParamHandlerCB<ParamMatrix4> MatrixParamHandlerRowsCB;
 
 class MatrixParamHandlerColumnsCB : public ParamHandlerCB {
  public:
   MatrixParamHandlerColumnsCB(ParamMatrix4* param, ResourceID id)
       : param_(param),
         id_(id) {
   }
 
   // Sends the param value to the service.
   virtual void SetValue(CommandBufferHelper *helper) {
-    CommandBufferEntry args[18];
     Matrix4 value = transpose(param_->value());
-    args[0].value_uint32 = id_;
-    args[1].value_uint32 = sizeof(value);
-    memcpy(args + 2, &value, sizeof(value));
-    helper->AddCommand(command_buffer::SET_PARAM_DATA_IMMEDIATE, 18, args);
+    helper->SetParamDataImmediate(id_, sizeof(value), &value);
   }
  private:
   ParamMatrix4* param_;
   ResourceID id_;
 };
 
 class SamplerParamHandlerCB : public ParamHandlerCB {
  public:
   SamplerParamHandlerCB(ParamSampler* param, ResourceID id)
       : param_(param),
         id_(id) {
   }
 
   // Sends the param value to the service.
   virtual void SetValue(CommandBufferHelper *helper) {
     SamplerCB *sampler = down_cast<SamplerCB *>(param_->value());
-    CommandBufferEntry args[3];
-    args[0].value_uint32 = id_;
-    args[1].value_uint32 = sizeof(ResourceID);
+    uint32 value;
     if (!sampler) {
       // TODO: use error sampler
-      args[2].value_uint32 = command_buffer::kInvalidResource;
+      value = command_buffer::kInvalidResource;
     } else {
       sampler->SetTextureAndStates();
-      args[2].value_uint32 = sampler->resource_id();
+      value = sampler->resource_id();
     }
-    helper->AddCommand(command_buffer::SET_PARAM_DATA_IMMEDIATE, 3, args);
+    helper->SetParamDataImmediate(id_, sizeof(value), &value);
   }
  private:
   ParamSampler* param_;
   ResourceID id_;
 };
 
 static ParamHandlerCB *GetHandlerFromParamAndDesc(
     Param *param,
     const EffectHelper::EffectParamDesc &desc,
     Effect::MatrixLoadOrder matrix_load_order) {
@@ skipping 145 matching lines @@
   handlers_.clear();
 }
 
 void ParamCacheCB::RunHandlers(CommandBufferHelper *helper) {
   for (unsigned int i = 0; i < handlers_.size(); ++i) {
     handlers_[i]->SetValue(helper);
   }
 }
 
 }  // namespace o3d