More work in Command Buffers...

core/cross/command_buffer/render_surface_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 17 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 
 #include "core/cross/command_buffer/render_surface_cb.h"
 #include "command_buffer/client/cross/cmd_buffer_helper.h"
 
 namespace o3d {
 
-using command_buffer::ResourceID;
+using command_buffer::ResourceId;
 using command_buffer::CommandBufferEntry;
 using command_buffer::CommandBufferHelper;
-namespace create_render_surface_cmd = command_buffer::create_render_surface_cmd;
 
 RenderSurfaceCB::RenderSurfaceCB(ServiceLocator *service_locator,
                                  int width,
                                  int height,
                                  int mip_level,
                                  int side,
                                  Texture *texture,
                                  RendererCB *renderer)
     : RenderSurface(service_locator, width, height, texture),
       resource_id_(command_buffer::kInvalidResource),
       renderer_(renderer) {
   DCHECK_GT(width, 0);
   DCHECK_GT(height, 0);
   DCHECK_GT(mip_level, -1);
   DCHECK(texture);
   DCHECK(renderer);
 
-  ResourceID id = renderer_->render_surface_ids().AllocateID();
+  ResourceId id = renderer_->render_surface_ids().AllocateID();
   resource_id_ = id;
   CommandBufferHelper *helper = renderer_->helper();
   helper->CreateRenderSurface(
       id,
       reinterpret_cast<uint32>(texture->GetTextureHandle()),
       width, height, mip_level, side);
 }
 
 RenderSurfaceCB::~RenderSurfaceCB() {
   Destroy();
@@ skipping 13 matching lines @@
     ServiceLocator *service_locator,
     int width,
     int height,
     RendererCB *renderer)
     : RenderDepthStencilSurface(service_locator, width, height),
       resource_id_(command_buffer::kInvalidResource),
       renderer_(renderer) {
   DCHECK_GT(width, 0);
   DCHECK_GT(height, 0);
   DCHECK(renderer);
-  ResourceID id = renderer_->depth_surface_ids().AllocateID();
+  ResourceId id = renderer_->depth_surface_ids().AllocateID();
   resource_id_ = id;
   CommandBufferHelper *helper = renderer_->helper();
   helper->CreateDepthSurface(id, width, height);
 }
 
 void RenderDepthStencilSurfaceCB::Destroy() {
   if (resource_id_ != command_buffer::kInvalidResource) {
     CommandBufferHelper *helper = renderer_->helper();
     helper->DestroyDepthSurface(resource_id_);
     renderer_->depth_surface_ids().FreeID(resource_id_);
     resource_id_ = command_buffer::kInvalidResource;
   }
 }
 
 }  // namespace o3d