More work in Command Buffers...

command_buffer/service/win/d3d9/texture_d3d9.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 82 matching lines @@
 class Texture2DD3D9 : public TextureD3D9 {
  public:
   Texture2DD3D9(unsigned int levels,
                 texture::Format format,
                 unsigned int flags,
                 unsigned int width,
                 unsigned int height,
                 IDirect3DTexture9 *texture,
                 IDirect3DTexture9 *shadow,
                 bool enable_render_surfaces)
-      : TextureD3D9(texture::TEXTURE_2D, levels, format,
+      : TextureD3D9(texture::kTexture2d, levels, format,
                     enable_render_surfaces, flags),
         width_(width),
         height_(height),
         d3d_texture_(texture),
         d3d_shadow_(shadow) {}
   virtual ~Texture2DD3D9();
 
   // Creates a 2D texture resource.
   static Texture2DD3D9 *Create(GAPID3D9 *gapi,
                                unsigned int width,
@@ skipping 43 matching lines @@
  public:
   Texture3DD3D9(unsigned int levels,
                 texture::Format format,
                 unsigned int flags,
                 unsigned int width,
                 unsigned int height,
                 unsigned int depth,
                 IDirect3DVolumeTexture9 *texture,
                 IDirect3DVolumeTexture9 *shadow,
                 bool enable_render_surfaces)
-      : TextureD3D9(texture::TEXTURE_2D, levels, format,
+      : TextureD3D9(texture::kTexture3d, levels, format,
                     enable_render_surfaces, flags),
         width_(width),
         height_(height),
         depth_(depth),
         d3d_texture_(texture),
         d3d_shadow_(shadow) {}
   virtual ~Texture3DD3D9();
   // Creates a 3D texture resource.
   static Texture3DD3D9 *Create(GAPID3D9 *gapi,
                                unsigned int width,
@@ skipping 43 matching lines @@
 // A cube map texture resource for D3D.
 class TextureCubeD3D9 : public TextureD3D9 {
  public:
   TextureCubeD3D9(unsigned int levels,
                   texture::Format format,
                   unsigned int flags,
                   unsigned int side,
                   IDirect3DCubeTexture9 *texture,
                   IDirect3DCubeTexture9 *shadow,
                   bool enable_render_surfaces)
-      : TextureD3D9(texture::TEXTURE_CUBE, levels, format,
+      : TextureD3D9(texture::kTextureCube, levels, format,
                     enable_render_surfaces, flags),
         side_(side),
         d3d_texture_(texture),
         d3d_shadow_(shadow) {}
   virtual ~TextureCubeD3D9();
   // Creates a cube map texture resource.
   static TextureCubeD3D9 *Create(GAPID3D9 *gapi,
                                  unsigned int side,
                                  unsigned int levels,
                                  texture::Format format,
@@ skipping 31 matching lines @@
   unsigned int side_;
   CComPtr<IDirect3DCubeTexture9> d3d_texture_;
   IDirect3DCubeTexture9 *d3d_shadow_;
   DISALLOW_COPY_AND_ASSIGN(TextureCubeD3D9);
 };
 
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_TEXTURE_D3D9_H_