Fixes to get renderer=cb cb_service=gl to compile

again.

I was working on spliting some of the command buffer 
code in preparation for GL command buffers so those
changes are in there as well. I didn't realize the
gl command buffers were broken.

I'm planning on sharing some of the command buffer
code and commands so I thought about making the
command buffers into 2 parts. The first N (256?)
commands are common commands.  Noop, SetToken, Jump
Gosub. Those will be handled by common code.

After that come the O3D or GL command buffer
commands. I'm not sure that's a good idea but
there is a significant amount of code in managing
tokens and parsing etc and it seems like it would
be nice to share it until/if we delete the O3D 
command buffers.

Note: You'll see that SetToken is hardcoded to 1.
I plan to fix that in the next CL when I split
the command into shared vs specific.

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

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

1 files changed, 3 insertions, 1 deletions

diff --git a/o3d/command_buffer/service/cross/cmd_parser.cc b/o3d/command_buffer/service/cross/cmd_parser.cc
index d17ab99..6f72aed 100644
--- a/o3d/command_buffer/service/cross/cmd_parser.cc
+++ b/o3d/command_buffer/service/cross/cmd_parser.cc
@@ -33,6 +33,8 @@
 // This file contains the implementation of the command parser.
 
 #include "command_buffer/service/cross/cmd_parser.h"
+// TODO(gman): remove this so we can use this code for different formats.
+#include "command_buffer/common/cross/cmd_buffer_format.h"
 
 namespace o3d {
 namespace command_buffer {
@@ -86,7 +88,7 @@ parse_error::ParseError CommandParser::ProcessCommand() {
   //     get these errors.
   if (result != parse_error::kParseNoError) {
     DLOG(INFO) << "Error: " << result << " for Command "
-               << GetCommandName(static_cast<CommandId>(header.command));
+               << cmd::GetCommandName(static_cast<CommandId>(header.command));
   }
   get_ = (get + header.size) % entry_count_;
   return result;