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

core/cross/command_buffer/sampler_cb.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 SamplerCB class.
 
 #include "core/cross/precompile.h"
 #include "core/cross/error.h"
 #include "core/cross/command_buffer/sampler_cb.h"
 #include "core/cross/command_buffer/renderer_cb.h"
-#include "command_buffer/common/cross/cmd_buffer_format.h"
+#include "command_buffer/common/cross/o3d_cmd_format.h"
 #include "command_buffer/client/cross/o3d_cmd_helper.h"
 
 namespace o3d {
 
 using command_buffer::CommandBufferEntry;
 using command_buffer::O3DCmdHelper;
 using command_buffer::ResourceId;
 namespace sampler = command_buffer::sampler;
 
 namespace {
@@ skipping 47 matching lines @@
   O3DCmdHelper* helper = renderer_->helper();
   sampler::AddressingMode address_mode_u_cb = AddressModeToCB(address_mode_u());
   sampler::AddressingMode address_mode_v_cb = AddressModeToCB(address_mode_v());
   sampler::AddressingMode address_mode_w_cb = AddressModeToCB(address_mode_w());
   sampler::FilteringMode mag_filter_cb = FilterTypeToCB(mag_filter());
   sampler::FilteringMode min_filter_cb = FilterTypeToCB(min_filter());
   sampler::FilteringMode mip_filter_cb = FilterTypeToCB(mip_filter());
   if (mag_filter_cb == sampler::kNone) mag_filter_cb = sampler::kPoint;
   if (min_filter_cb == sampler::kNone) min_filter_cb = sampler::kPoint;
   int max_max_anisotropy =
-      command_buffer::cmd::SetSamplerStates::MaxAnisotropy::kMask;
+      command_buffer::o3d::SetSamplerStates::MaxAnisotropy::kMask;
   unsigned int max_anisotropy_cb =
       std::max(1, std::min(max_max_anisotropy, max_anisotropy()));
   if (min_filter() != Sampler::ANISOTROPIC) {
     max_anisotropy_cb = 1;
   }
   helper->SetSamplerStates(
       resource_id_,
       address_mode_u_cb,
       address_mode_v_cb,
       address_mode_w_cb,
@@ skipping 17 matching lines @@
   }
 
   if (texture_object) {
     helper->SetSamplerTexture(
         resource_id_,
         reinterpret_cast<uint32>(texture_object->GetTextureHandle()));
   }
 }
 
 }  // namespace o3d