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

command_buffer/service/cross/gl/texture_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 19 matching lines @@
  */
 
 
 // This file implements the texture-related GAPI functions on GL.
 
 #include "command_buffer/service/cross/gl/gapi_gl.h"
 #include "command_buffer/service/cross/gl/texture_gl.h"
 
 namespace o3d {
 namespace command_buffer {
+namespace o3d {
 
 namespace {
 
 // Gets the GL internal format, format and type corresponding to a command
 // buffer texture format.
 bool GetGLFormatType(texture::Format format,
                      GLenum *internal_format,
                      GLenum *gl_format,
                      GLenum *gl_type) {
   switch (format) {
@@ skipping 586 matching lines @@
 
   GLenum framebuffer_status = ::glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
   if (GL_FRAMEBUFFER_COMPLETE_EXT != framebuffer_status) {
     return false;
   }
 
   return true;
 }
 
 
-// GAPIGL functions.
-
 // Destroys a texture resource.
 parse_error::ParseError GAPIGL::DestroyTexture(ResourceId id) {
   // Dirty effect, because this texture id may be used.
   DirtyEffect();
   return textures_.Destroy(id) ?
       parse_error::kParseNoError :
       parse_error::kParseInvalidArguments;
 }
 
 // Creates a 2D texture resource.
@@ skipping 99 matching lines @@
   Volume volume = {x, y, z, width, height, depth};
   // Dirty effect: GetData may need to call glBindTexture which will mess up the
   // sampler parameters.
   DirtyEffect();
   return texture->GetData(volume, level, face, row_pitch, slice_pitch,
                           size, data) ?
       parse_error::kParseNoError :
       parse_error::kParseInvalidArguments;
 }
 
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d