[6/6] wined3d: Rename dummyTextureName variable.

[Matteo Bruni]

-------------- next part --------------
From cb952b8166a51c2d41212a1c6f401cc38b3a3184 Mon Sep 17 00:00:00 2001
From: Matteo Bruni <mbruni at codeweavers.com>
Date: Fri, 1 Jul 2011 16:50:38 +0200
Subject: wined3d: Rename dummyTextureName variable.

---
 dlls/wined3d/device.c          |   10 +++++-----
 dlls/wined3d/state.c           |    2 +-
 dlls/wined3d/wined3d_private.h |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 5b6b9fc..c1e6d70 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -993,11 +993,11 @@ static void create_dummy_textures(struct wined3d_device *device)
         GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i));
         checkGLcall("glActiveTextureARB");
 
-        glGenTextures(1, &device->dummyTextureName[i]);
+        glGenTextures(1, &device->dummy_texture_2d[i]);
         checkGLcall("glGenTextures");
-        TRACE("Dummy 2D texture %d given name %d.\n", i, device->dummyTextureName[i]);
+        TRACE("Dummy 2D texture %d given name %d.\n", i, device->dummy_texture_2d[i]);
 
-        glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[i]);
+        glBindTexture(GL_TEXTURE_2D, device->dummy_texture_2d[i]);
         checkGLcall("glBindTexture");
 
         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color);
@@ -1080,8 +1080,8 @@ static void destroy_dummy_textures(struct wined3d_device *device, const struct w
         checkGLcall("glDeleteTextures(count, device->dummy_texture_rect)");
     }
 
-    glDeleteTextures(count, device->dummyTextureName);
-    checkGLcall("glDeleteTextures(count, device->dummyTextureName)");
+    glDeleteTextures(count, device->dummy_texture_2d);
+    checkGLcall("glDeleteTextures(count, device->dummy_texture_2d)");
     LEAVE_GL();
 }
 
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 0dd1211..0688069 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -3577,7 +3577,7 @@ static void sampler(DWORD state_id, struct wined3d_stateblock *stateblock, struc
                 /* nothing to do */
                 break;
             case GL_TEXTURE_2D:
-                glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[sampler]);
+                glBindTexture(GL_TEXTURE_2D, device->dummy_texture_2d[sampler]);
                 checkGLcall("glBindTexture()");
                 break;
             case GL_TEXTURE_RECTANGLE_ARB:
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 00a7dbe..f58e869 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1711,7 +1711,7 @@ struct wined3d_device
     struct wined3d_surface *logo_surface;
 
     /* Textures for when no other textures are mapped */
-    UINT                          dummyTextureName[MAX_COMBINED_SAMPLERS];
+    UINT dummy_texture_2d[MAX_COMBINED_SAMPLERS];
     UINT dummy_texture_rect[MAX_COMBINED_SAMPLERS];
     UINT dummy_texture_3d[MAX_COMBINED_SAMPLERS];
     UINT dummy_texture_cube[MAX_COMBINED_SAMPLERS];
-- 
1.7.3.4