More work in Command Buffers...

command_buffer/service/cross/gl/effect_gl.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 98 matching lines @@
 
   // Creates an effect parameter of the specified name.
   EffectParamGL *CreateParamByName(const char *name);
 
  private:
   struct LowLevelParam {
     const char *name;
     CGparameter vp_param;
     CGparameter fp_param;
     int num_elements;
-    std::vector<ResourceID> sampler_ids;
+    std::vector<ResourceId> sampler_ids;
   };
   typedef std::vector<LowLevelParam> LowLevelParamList;
   typedef std::vector<EffectParamGL *> ParamList;
   typedef std::vector<effect_stream::Desc> StreamList;
 
   static CGparameter GetEitherCgParameter(
       const LowLevelParam &low_level_param) {
     return low_level_param.vp_param ?
         low_level_param.vp_param : low_level_param.fp_param;
   }
@@ skipping 26 matching lines @@
 
   friend class EffectParamGL;
   DISALLOW_COPY_AND_ASSIGN(EffectGL);
 };
 
 
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_EFFECT_GL_H_