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

gpu_plugin/gpu_processor.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef O3D_GPU_PLUGIN_GPU_PROCESSOR_H_
 #define O3D_GPU_PLUGIN_GPU_PROCESSOR_H_
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
@@ skipping 13 matching lines @@
 
 namespace o3d {
 namespace gpu_plugin {
 
 // This class processes commands in a command buffer. It is event driven and
 // posts tasks to the current message loop to do additional work.
 class GPUProcessor : public ::base::RefCounted<GPUProcessor>,
                      public command_buffer::CommandBufferEngine {
  public:
 #if defined(CB_SERVICE_D3D9)
-  typedef command_buffer::GAPID3D9 GPUGAPIInterface;
+  typedef command_buffer::o3d::GAPID3D9 GPUGAPIInterface;
 #elif defined(CB_SERVICE_GL)
-  typedef command_buffer::GAPIGL GPUGAPIInterface;
+  typedef command_buffer::o3d::GAPIGL GPUGAPIInterface;
 #else
 #error command buffer service not defined
 #endif
 
   GPUProcessor(NPP npp,
                CommandBuffer* command_buffer);
 
   // This constructor is for unit tests.
   GPUProcessor(NPP npp,
                CommandBuffer* command_buffer,
                GPUGAPIInterface* gapi,
-               command_buffer::GAPIDecoder* decoder,
+               command_buffer::o3d::GAPIDecoder* decoder,
                command_buffer::CommandParser* parser,
                int commands_per_update);
 
   virtual bool Initialize(HWND hwnd);
 
   virtual ~GPUProcessor();
 
   virtual void Destroy();
 
   virtual void ProcessCommands();
@@ skipping 22 matching lines @@
 
   // The GPUProcessor holds a weak reference to the CommandBuffer. The
   // CommandBuffer owns the GPUProcessor and holds a strong reference to it
   // through the ProcessCommands callback.
   CommandBuffer* command_buffer_;
 
   scoped_ptr< ::base::SharedMemory> mapped_ring_buffer_;
   int commands_per_update_;
 
   scoped_ptr<GPUGAPIInterface> gapi_;
-  scoped_ptr<command_buffer::GAPIDecoder> decoder_;
+  scoped_ptr<command_buffer::o3d::GAPIDecoder> decoder_;
   scoped_ptr<command_buffer::CommandParser> parser_;
 };
 
 }  // namespace gpu_plugin
 }  // namespace o3d
 
 // Callbacks to the GPUProcessor hold a reference count.
 template <typename Method>
 class CallbackStorage<o3d::gpu_plugin::GPUProcessor, Method> {
  public:
@@ skipping 10 matching lines @@
 
  protected:
   o3d::gpu_plugin::GPUProcessor* obj_;
   Method meth_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CallbackStorage);
 };
 
 #endif  // O3D_GPU_PLUGIN_GPU_PROCESSOR_H_