move all O3D specific command buffer stuff to command_buffer::o3d...

core/cross/command_buffer/states_cb.h

 /*
  * 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 19 matching lines @@
  */
 
 
 // This file contains the RendererCB::StateManager class, managing states for
 // the command-buffer renderer.
 
 #ifndef O3D_CORE_CROSS_COMMAND_BUFFER_STATES_CB_H_
 #define O3D_CORE_CROSS_COMMAND_BUFFER_STATES_CB_H_
 
 #include "core/cross/command_buffer/renderer_cb.h"
-#include "command_buffer/common/cross/cmd_buffer_format.h"
+#include "command_buffer/common/cross/o3d_cmd_format.h"
 #include "command_buffer/client/cross/cmd_buffer_helper.h"
 
 namespace o3d {
 
 // This class manages the states for the command-buffer renderer. It takes care
 // of the registration of the state handlers, as well as the sending of
 // commands to commit modified states.
 class RendererCB::StateManager {
  public:
   StateManager() { }
@@ skipping 29 matching lines @@
       return command_;
     }
 
     bool *dirty_ptr() { return &dirty_; }
    private:
     bool dirty_;
     CommandType command_;
     DISALLOW_COPY_AND_ASSIGN(StateHelper);
   };
 
-  StateHelper<command_buffer::cmd::SetPointLineRaster> point_line_helper_;
-  StateHelper<command_buffer::cmd::SetPolygonOffset> poly_offset_helper_;
-  StateHelper<command_buffer::cmd::SetPolygonRaster> poly_raster_helper_;
-  StateHelper<command_buffer::cmd::SetAlphaTest> alpha_test_helper_;
-  StateHelper<command_buffer::cmd::SetDepthTest> depth_test_helper_;
-  StateHelper<command_buffer::cmd::SetStencilTest> stencil_test_helper_;
-  StateHelper<command_buffer::cmd::SetColorWrite> color_write_helper_;
-  StateHelper<command_buffer::cmd::SetBlending> blending_helper_;
-  StateHelper<command_buffer::cmd::SetBlendingColor> blending_color_helper_;
+  StateHelper<command_buffer::o3d::SetPointLineRaster> point_line_helper_;
+  StateHelper<command_buffer::o3d::SetPolygonOffset> poly_offset_helper_;
+  StateHelper<command_buffer::o3d::SetPolygonRaster> poly_raster_helper_;
+  StateHelper<command_buffer::o3d::SetAlphaTest> alpha_test_helper_;
+  StateHelper<command_buffer::o3d::SetDepthTest> depth_test_helper_;
+  StateHelper<command_buffer::o3d::SetStencilTest> stencil_test_helper_;
+  StateHelper<command_buffer::o3d::SetColorWrite> color_write_helper_;
+  StateHelper<command_buffer::o3d::SetBlending> blending_helper_;
+  StateHelper<command_buffer::o3d::SetBlendingColor> blending_color_helper_;
   DISALLOW_COPY_AND_ASSIGN(StateManager);
 };
 
 }  // namespace o3d
 
 #endif  // O3D_CORE_CROSS_COMMAND_BUFFER_STATES_CB_H_