More work in Command Buffers...

core/cross/command_buffer/effect_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 39 matching lines @@
   friend class ParamCacheCB;
   typedef command_buffer::EffectHelper EffectHelper;
 
   EffectCB(ServiceLocator *service_locator, RendererCB *renderer);
   virtual ~EffectCB();
 
   // Loads the vertex and fragment shader programs from a string containing
   // a DirectX FX description.
   virtual bool LoadFromFXString(const String& effect);
 
-  // Gets the ResourceID of the effect.
-  command_buffer::ResourceID resource_id() { return resource_id_; }
+  // Gets the ResourceId of the effect.
+  command_buffer::ResourceId resource_id() { return resource_id_; }
 
  protected:
   // Gets info about the parameters this effect needs.
   // Overriden from Effect.
   virtual void GetParameterInfo(EffectParameterInfoArray* info_array);
 
   // Gets info about the varying parameters this effects vertex shader needs.
   // Parameters:
   //   info_array: EffectStreamInfoArray to receive info.
   virtual void GetStreamInfo(EffectStreamInfoArray* info_array);
 
  private:
   void Destroy();
   // The command buffer resource ID for the effect.
-  command_buffer::ResourceID resource_id_;
+  command_buffer::ResourceId resource_id_;
   std::vector<EffectHelper::EffectParamDesc> param_descs_;
   std::vector<EffectHelper::EffectStreamDesc> stream_descs_;
   // A generation counter to dirty ParamCacheCBs.
   unsigned int generation_;
   // The renderer that created this effect.
   RendererCB *renderer_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(EffectCB);
 };
 
 }  // namespace o3d
 
 #endif  // O3D_CORE_CROSS_COMMAND_BUFFER_EFFECT_CB_H_