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

command_buffer/service/cross/gl/sampler_gl.h

 /*
  * 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 23 matching lines @@
 
 #ifndef O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_SAMPLER_GL_H_
 #define O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_SAMPLER_GL_H_
 
 #include "command_buffer/common/cross/gapi_interface.h"
 #include "command_buffer/service/cross/gl/gl_utils.h"
 #include "command_buffer/service/cross/resource.h"
 
 namespace o3d {
 namespace command_buffer {
+namespace o3d {
 
 class GAPIGL;
 
 // GL version of Sampler.
 class SamplerGL : public Sampler {
  public:
   SamplerGL();
 
   // Applies sampler states to GL.
   bool ApplyStates(GAPIGL *gapi);
 
   // Sets sampler states.
   void SetStates(sampler::AddressingMode addressing_u,
                  sampler::AddressingMode addressing_v,
                  sampler::AddressingMode addressing_w,
                  sampler::FilteringMode mag_filter,
                  sampler::FilteringMode min_filter,
                  sampler::FilteringMode mip_filter,
                  unsigned int max_anisotropy);
 
   // Sets the border color states.
-  void SetBorderColor(const RGBA &color);
+  void SetBorderColor(const o3d::RGBA &color);
 
   // Sets the texture.
   void SetTexture(ResourceId texture) { texture_id_ = texture; }
 
   GLuint gl_texture() const { return gl_texture_; }
 
  private:
   GLenum gl_wrap_s_;
   GLenum gl_wrap_t_;
   GLenum gl_wrap_r_;
   GLenum gl_mag_filter_;
   GLenum gl_min_filter_;
   GLuint gl_max_anisotropy_;
   GLfloat gl_border_color_[4];
   GLuint gl_texture_;
   ResourceId texture_id_;
 };
 
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_SAMPLER_GL_H_