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

command_buffer/service/cross/gl/sampler_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 sampler-related GAPI functions on GL.
 
 #include "command_buffer/service/cross/gl/gapi_gl.h"
 #include "command_buffer/service/cross/gl/sampler_gl.h"
 
 namespace o3d {
 namespace command_buffer {
+namespace o3d {
 
 namespace {
 
 // Gets the GL enum corresponding to an addressing mode.
 GLenum GLAddressMode(sampler::AddressingMode o3d_mode) {
   switch (o3d_mode) {
     case sampler::kWrap:
       return GL_REPEAT;
     case sampler::kMirrorRepeat:
       return GL_MIRRORED_REPEAT;
@@ skipping 176 matching lines @@
     ResourceId texture_id) {
   SamplerGL *sampler = samplers_.Get(id);
   if (!sampler)
     return parse_error::kParseInvalidArguments;
   // Dirty effect, because this sampler id may be used.
   DirtyEffect();
   sampler->SetTexture(texture_id);
   return parse_error::kParseNoError;
 }
 
-
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d