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

core/cross/command_buffer/renderer_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 38 matching lines @@
 #include "core/cross/command_buffer/texture_cb.h"
 #include "core/cross/command_buffer/display_window_cb.h"
 #include "core/cross/renderer_platform.h"
 #include "gpu_plugin/command_buffer.h"
 #include "gpu_plugin/gpu_processor.h"
 #include "gpu_plugin/np_utils/np_browser.h"
 #include "gpu_plugin/np_utils/np_utils.h"
 #include "gpu_plugin/system_services/shared_memory.h"
 
 namespace o3d {
-using command_buffer::GAPIInterface;
+using command_buffer::o3d::GAPIInterface;
 using command_buffer::O3DCmdHelper;
 using gpu_plugin::CommandBuffer;
 using gpu_plugin::GPUProcessor;
 using gpu_plugin::NPBrowser;
 using gpu_plugin::NPCreateObject;
 using gpu_plugin::NPGetProperty;
 using gpu_plugin::NPInvoke;
 using gpu_plugin::NPInvokeVoid;
 using gpu_plugin::NPObjectPointer;
 using gpu_plugin::SharedMemory;
@@ skipping 54 matching lines @@
   return true;
 }
 
 // Adds the CLEAR command to the command buffer.
 void RendererCB::PlatformSpecificClear(const Float4 &color,
                                        bool color_flag,
                                        float depth,
                                        bool depth_flag,
                                        int stencil,
                                        bool stencil_flag) {
-  uint32 buffers = (color_flag ? command_buffer::kColor : 0) |
-      (depth_flag ? command_buffer::kDepth : 0) |
-      (stencil_flag ? command_buffer::kStencil : 0);
+  uint32 buffers = (color_flag ? command_buffer::o3d::kColor : 0) |
+                   (depth_flag ? command_buffer::o3d::kDepth : 0) |
+                   (stencil_flag ? command_buffer::o3d::kStencil : 0);
   helper_->Clear(buffers, color[0], color[1], color[2], color[3],
                  depth, stencil);
 }
 
 void RendererCB::PlatformSpecificEndDraw() {
 }
 
 // Adds the BeginFrame command to the command buffer.
 bool RendererCB::PlatformSpecificStartRendering() {
   // Any device issues are handled in the command buffer backend
@@ skipping 298 matching lines @@
   }
 
   return shared_memory;
 }
 
 Renderer* Renderer::CreateDefaultRenderer(ServiceLocator* service_locator) {
   return RendererCBLocal::CreateDefault(service_locator);
 }
 
 }  // namespace o3d