More work in Command Buffers...

core/cross/command_buffer/texture_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 63 matching lines @@
                        unsigned height,
                        const void* src_data,
                        int src_pitch);
 
   // Returns the implementation-specific texture handle for this texture.
   virtual void* GetTextureHandle() const {
     return reinterpret_cast<void*>(resource_id_);
   }
 
   // Gets the texture resource ID.
-  command_buffer::ResourceID resource_id() const { return resource_id_; }
+  command_buffer::ResourceId resource_id() const { return resource_id_; }
 
   // Gets a RGBASwizzleIndices that contains a mapping from
   // RGBA to the internal format used by the rendering API.
   virtual const RGBASwizzleIndices& GetABGR32FSwizzleIndices();
 
  protected:
   // Overridden from Texture2D
   virtual bool PlatformSpecificLock(
       int level, void** texture_data, int* pitch, AccessMode mode);
 
   // Overridden from Texture2D
   virtual bool PlatformSpecificUnlock(int level);
 
   // Overridden from Texture2D
   virtual RenderSurface::Ref PlatformSpecificGetRenderSurface(int mip_level);
 
  private:
   // Initializes the Texture2DCB from a preexisting OpenCB texture handle
   // and raw Bitmap data.
   // The texture takes ownership of the bitmap data.
   Texture2DCB(ServiceLocator* service_locator,
-              command_buffer::ResourceID resource_id,
+              command_buffer::ResourceId resource_id,
               Texture::Format format,
               int levels,
               int width,
               int height,
               bool enable_render_surfaces);
 
   // Returns true if the backing bitmap has the data for the level.
   bool HasLevel(unsigned int level) {
     DCHECK_LT(level, static_cast<unsigned int>(levels()));
     return (has_levels_ & (1 << level)) != 0;
   }
 
   RendererCB* renderer_;
-  command_buffer::ResourceID resource_id_;
+  command_buffer::ResourceId resource_id_;
 
   // A bitmap used to back the NPOT textures on POT-only hardware, and to back
   // the pixel buffer for Lock().
   Bitmap::Ref backing_bitmap_;
 
   // Bitfield that indicates mip levels that are currently stored in the
   // backing bitmap.
   unsigned int has_levels_;
 
   // Bitfield that indicates which mip levels are currently locked.
@@ skipping 24 matching lines @@
                        unsigned height,
                        const void* src_data,
                        int src_pitch);
 
   // Returns the implementation-specific texture handle for this texture.
   virtual void* GetTextureHandle() const {
     return reinterpret_cast<void*>(resource_id_);
   }
 
   // Gets the texture resource ID.
-  command_buffer::ResourceID resource_id() const { return resource_id_; }
+  command_buffer::ResourceId resource_id() const { return resource_id_; }
 
   // Gets a RGBASwizzleIndices that contains a mapping from
   // RGBA to the internal format used by the rendering API.
   virtual const RGBASwizzleIndices& GetABGR32FSwizzleIndices();
 
  protected:
   // Overridden from TextureCUBE
   virtual bool PlatformSpecificLock(
       CubeFace face, int level, void** texture_data, int* pitch,
       AccessMode mode);
 
   // Overridden from TextureCUBE
   virtual bool PlatformSpecificUnlock(CubeFace face, int level);
 
   // Overridden from TextureCUBE.
   virtual RenderSurface::Ref PlatformSpecificGetRenderSurface(CubeFace face,
                                                               int level);
  private:
   // Creates a texture from a pre-existing texture resource.
   TextureCUBECB(ServiceLocator* service_locator,
-                command_buffer::ResourceID texture,
+                command_buffer::ResourceId texture,
                 Texture::Format format,
                 int levels,
                 int edge_length,
                 bool enable_render_surfaces);
 
 
   // Returns true if the backing bitmap has the data for the level.
   bool HasLevel(CubeFace face, unsigned int level) {
     DCHECK_LT(level, static_cast<unsigned int>(levels()));
     return (has_levels_[face] & (1 << level)) != 0;
   }
 
   RendererCB* renderer_;
-  command_buffer::ResourceID resource_id_;
+  command_buffer::ResourceId resource_id_;
 
   // Bitmaps used to back the NPOT textures on POT-only hardware.
   Bitmap::Ref backing_bitmaps_[NUMBER_OF_FACES];
 
   // Bitfields that indicates mip levels that are currently stored in the
   // backing bitmap, one per face.
   unsigned int has_levels_[NUMBER_OF_FACES];
 
   // Bitfields that indicates which levels are currently locked, one per face.
   unsigned int locked_levels_[NUMBER_OF_FACES];
 };
 
 }  // namespace o3d
 
 #endif  // O3D_CORE_CROSS_COMMAND_BUFFER_TEXTURE_CB_H_