More work in Command Buffers...

core/cross/command_buffer/sampler_cb.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 36 matching lines @@
 // SamplerCB is an implementation of the Sampler object for command buffers.
 class SamplerCB : public Sampler {
  public:
   SamplerCB(ServiceLocator* service_locator, RendererCB* renderer);
   virtual ~SamplerCB();
 
   // Sets the d3d texture and sampler states for the given sampler unit.
   void SetTextureAndStates();
 
   // Gets the resource ID for this sampler.
-  command_buffer::ResourceID resource_id() const { return resource_id_; }
+  command_buffer::ResourceId resource_id() const { return resource_id_; }
 
  private:
   RendererCB* renderer_;
-  command_buffer::ResourceID resource_id_;
+  command_buffer::ResourceId resource_id_;
   DISALLOW_COPY_AND_ASSIGN(SamplerCB);
 };
 
 }  // namespace o3d
 
 #endif  // O3D_CORE_CROSS_COMMAND_BUFFER_SAMPLER_CB_H_