Splits the command buffers into common commands

and specific commands.

Common are things like Noop, SetToken, Jump, Gosub, return.

Specific are O3D etc...

Review URL: http://codereview.chromium.org/329046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30365 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 11 deletions

diff --git a/o3d/command_buffer/client/cross/cmd_buffer_helper.h b/o3d/command_buffer/client/cross/cmd_buffer_helper.h
index e69e020..6d17f79 100644
--- a/o3d/command_buffer/client/cross/cmd_buffer_helper.h
+++ b/o3d/command_buffer/client/cross/cmd_buffer_helper.h
@@ -170,6 +170,19 @@ class CommandBufferHelper {
 
   parse_error::ParseError GetParseError();
 
+  // Common Commands
+  void Noop(uint32 skip_count) {
+    cmd::Noop& cmd = GetImmediateCmdSpace<cmd::Noop>(
+        skip_count * sizeof(CommandBufferEntry));
+    cmd.Init(skip_count);
+  }
+
+  void SetToken(uint32 token) {
+    cmd::SetToken& cmd = GetCmdSpace<cmd::SetToken>();
+    cmd.Init(token);
+  }
+
+
  private:
   // Waits until get changes, updating the value of get_.
   void WaitForGetChange();
diff --git a/o3d/command_buffer/client/cross/o3d_cmd_helper.h b/o3d/command_buffer/client/cross/o3d_cmd_helper.h
index c325766..59746da 100644
--- a/o3d/command_buffer/client/cross/o3d_cmd_helper.h
+++ b/o3d/command_buffer/client/cross/o3d_cmd_helper.h
@@ -57,17 +57,6 @@ class O3DCmdHelper : public CommandBufferHelper {
 
   // ------------------ Individual commands ----------------------
 
-  void Noop(uint32 skip_count) {
-    o3d::Noop& cmd = GetImmediateCmdSpace<o3d::Noop>(
-        skip_count * sizeof(CommandBufferEntry));
-    cmd.Init(skip_count);
-  }
-
-  void SetToken(uint32 token) {
-    o3d::SetToken& cmd = GetCmdSpace<o3d::SetToken>();
-    cmd.Init(token);
-  }
-
   void BeginFrame() {
     o3d::BeginFrame& cmd = GetCmdSpace<o3d::BeginFrame>();
     cmd.Init();