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

command_buffer/service/win/d3d9/gapi_d3d9.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 18 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 
 // This file contains the implementation of the GAPID3D9 class.
 
 #include "command_buffer/service/win/d3d9/gapi_d3d9.h"
 
 namespace o3d {
 namespace command_buffer {
+namespace o3d {
 
 GAPID3D9::GAPID3D9()
     : d3d_module_(NULL),
       d3dx_module_(NULL),
       d3d_(NULL),
       d3d_device_(NULL),
       hwnd_(NULL),
       current_vertex_struct_(0),
       validate_streams_(true),
       max_vertices_(0),
@@ skipping 253 matching lines @@
     LOG(ERROR) << "Drawing with invalid streams.";
     return false;
   }
   max_vertices_ = vertex_struct->SetStreams(this);
   validate_streams_ = false;
   return max_vertices_ > 0;
 }
 
 // Converts a GAPID3D9::PrimitiveType to a D3DPRIMITIVETYPE.
 static D3DPRIMITIVETYPE D3DPrimitive(
-    command_buffer::PrimitiveType primitive_type) {
+    PrimitiveType primitive_type) {
   switch (primitive_type) {
-    case command_buffer::kPoints:
+    case kPoints:
       return D3DPT_POINTLIST;
-    case command_buffer::kLines:
+    case kLines:
       return D3DPT_LINELIST;
-    case command_buffer::kLineStrips:
+    case kLineStrips:
       return D3DPT_LINESTRIP;
-    case command_buffer::kTriangles:
+    case kTriangles:
       return D3DPT_TRIANGLELIST;
-    case command_buffer::kTriangleStrips:
+    case kTriangleStrips:
       return D3DPT_TRIANGLESTRIP;
-    case command_buffer::kTriangleFans:
+    case kTriangleFans:
       return D3DPT_TRIANGLEFAN;
     default:
       LOG(FATAL) << "Invalid primitive type";
       return D3DPT_POINTLIST;
   }
 }
 
 // Draws with the current vertex struct.
 parse_error::ParseError GAPID3D9::Draw(
     PrimitiveType primitive_type,
@@ skipping 46 matching lines @@
     return parse_error::kParseInvalidArguments;
   }
 
   HR(d3d_device_->SetIndices(index_buffer->d3d_index_buffer()));
   HR(d3d_device_->DrawIndexedPrimitive(D3DPrimitive(primitive_type), 0,
                                        min_index, max_index - min_index + 1,
                                        first, count));
   return parse_error::kParseNoError;
 }
 
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d