Stefan Dösinger : wined3d: Don' t pass the texture stages to basetexture_apply_state_changes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5082c57e770d448d590b0f141ea5fdce0f87e187
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5082c57e770d448d590b0f141e...

Author: Stefan Dösinger 
Date:   Sun Oct 31 22:09:38 2010 +0100

wined3d: Don't pass the texture stages to basetexture_apply_state_changes.

---

dlls/wined3d/basetexture.c     |    3 +--
 dlls/wined3d/state.c           |    1 -
 dlls/wined3d/wined3d_private.h |    1 -
 3 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c
index f826f91..e49ba21 100644
--- a/dlls/wined3d/basetexture.c
+++ b/dlls/wined3d/basetexture.c
@@ -380,7 +380,6 @@ static void apply_wrap(const struct wined3d_gl_info *gl_info, GLenum target,

/* GL locking is done by the caller (state handler) */
 void basetexture_apply_state_changes(IWineD3DBaseTexture *iface,
-        const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1],
         const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1],
         const struct wined3d_gl_info *gl_info)
 {
@@ -391,7 +390,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface,
     DWORD aniso;
     struct gl_texture *gl_tex;

-    TRACE("iface %p, textureStates %p, samplerStates %p\n", iface, textureStates, samplerStates);
+    TRACE("iface %p, samplerStates %p\n", iface, samplerStates);

if(This->baseTexture.is_srgb) {
         gl_tex = &This->baseTexture.texture_srgb;
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 44c1081..83ed0c6 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -3648,7 +3648,6 @@ static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct w

IWineD3DBaseTexture_BindTexture(texture, srgb);
         basetexture_apply_state_changes(texture,
-                state->texture_states[sampler],
                 state->sampler_states[sampler], gl_info);

if (gl_info->supported[EXT_TEXTURE_LOD_BIAS])
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 6f6f0ce..3313963 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1920,7 +1920,6 @@ typedef struct IWineD3DBaseTextureImpl
 } IWineD3DBaseTextureImpl;

void basetexture_apply_state_changes(IWineD3DBaseTexture *iface,
-        const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1],
         const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1],
         const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;
 HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN;