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

command_buffer/service/cross/gl/geometry_gl.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 20 matching lines @@
 
 
 // This file contains the implementation of the VertexBufferGL, IndexBufferGL
 // and VertexStructGL classes, as well as the geometry-related GAPI functions.
 
 #include "command_buffer/service/cross/gl/gapi_gl.h"
 #include "command_buffer/service/cross/gl/geometry_gl.h"
 
 namespace o3d {
 namespace command_buffer {
+namespace o3d {
 
 VertexBufferGL::~VertexBufferGL() {
   glDeleteBuffers(1, &gl_buffer_);
   CHECK_GL_ERROR();
 }
 
 // Creates the GL buffer object.
 void VertexBufferGL::Create() {
   glGenBuffers(1, &gl_buffer_);
   glBindBuffer(GL_ARRAY_BUFFER, gl_buffer_);
@@ skipping 400 matching lines @@
     LOG(ERROR) << "Drawing with invalid streams.";
     return false;
   }
   max_vertices_ = vertex_struct->SetStreams(this);
   validate_streams_ = false;
   return max_vertices_ > 0;
 }
 
 namespace {
 
-void PrimitiveTypeToGL(command_buffer::PrimitiveType primitive_type,
+void PrimitiveTypeToGL(o3d::PrimitiveType primitive_type,
                        GLenum *gl_mode,
                        unsigned int *count) {
   switch (primitive_type) {
-    case command_buffer::kPoints:
+    case o3d::kPoints:
       *gl_mode = GL_POINTS;
       break;
-    case command_buffer::kLines:
+    case o3d::kLines:
       *gl_mode = GL_LINES;
       *count *= 2;
       break;
-    case command_buffer::kLineStrips:
+    case o3d::kLineStrips:
       *gl_mode = GL_LINE_STRIP;
       ++*count;
       break;
-    case command_buffer::kTriangles:
+    case o3d::kTriangles:
       *gl_mode = GL_TRIANGLES;
       *count *= 3;
       break;
-    case command_buffer::kTriangleStrips:
+    case o3d::kTriangleStrips:
       *gl_mode = GL_TRIANGLE_STRIP;
       *count += 2;
       break;
-    case command_buffer::kTriangleFans:
+    case o3d::kTriangleFans:
       *gl_mode = GL_TRIANGLE_FAN;
       *count += 2;
       break;
     default:
       LOG(FATAL) << "Invalid primitive type";
       break;
   }
 }
 
 }  // anonymous namespace
 
-parse_error::ParseError GAPIGL::Draw(PrimitiveType primitive_type,
-                                             unsigned int first,
-                                             unsigned int count) {
+parse_error::ParseError GAPIGL::Draw(o3d::PrimitiveType primitive_type,
+                                     unsigned int first,
+                                     unsigned int count) {
   if (validate_effect_ && !ValidateEffect()) {
     return parse_error::kParseInvalidArguments;
   }
   DCHECK(current_effect_);
   if (validate_streams_ && !ValidateStreams()) {
     return parse_error::kParseInvalidArguments;
   }
   GLenum gl_mode = GL_POINTS;
   PrimitiveTypeToGL(primitive_type, &gl_mode, &count);
   if (first + count > max_vertices_) {
     return parse_error::kParseInvalidArguments;
   }
   glDrawArrays(gl_mode, first, count);
   CHECK_GL_ERROR();
   return parse_error::kParseNoError;
 }
 
 parse_error::ParseError GAPIGL::DrawIndexed(
-    PrimitiveType primitive_type,
+    o3d::PrimitiveType primitive_type,
     ResourceId index_buffer_id,
     unsigned int first,
     unsigned int count,
     unsigned int min_index,
     unsigned int max_index) {
   IndexBufferGL *index_buffer = index_buffers_.Get(index_buffer_id);
   if (!index_buffer) return parse_error::kParseInvalidArguments;
   if (validate_effect_ && !ValidateEffect()) {
     return parse_error::kParseInvalidArguments;
   }
@@ skipping 14 matching lines @@
   GLuint offset = first * index_size;
   if (offset + count * index_size > index_buffer->size()) {
     return parse_error::kParseInvalidArguments;
   }
   glDrawRangeElements(gl_mode, min_index, max_index, count, index_type,
                       OffsetToPtr(offset));
   CHECK_GL_ERROR();
   return parse_error::kParseNoError;
 }
 
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d