Commit 5082c57e authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard

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

parent 886193c3
...@@ -380,7 +380,6 @@ static void apply_wrap(const struct wined3d_gl_info *gl_info, GLenum target, ...@@ -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) */ /* GL locking is done by the caller (state handler) */
void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, void basetexture_apply_state_changes(IWineD3DBaseTexture *iface,
const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1],
const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1],
const struct wined3d_gl_info *gl_info) const struct wined3d_gl_info *gl_info)
{ {
...@@ -391,7 +390,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, ...@@ -391,7 +390,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface,
DWORD aniso; DWORD aniso;
struct gl_texture *gl_tex; 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) { if(This->baseTexture.is_srgb) {
gl_tex = &This->baseTexture.texture_srgb; gl_tex = &This->baseTexture.texture_srgb;
......
...@@ -3648,7 +3648,6 @@ static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct w ...@@ -3648,7 +3648,6 @@ static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct w
IWineD3DBaseTexture_BindTexture(texture, srgb); IWineD3DBaseTexture_BindTexture(texture, srgb);
basetexture_apply_state_changes(texture, basetexture_apply_state_changes(texture,
state->texture_states[sampler],
state->sampler_states[sampler], gl_info); state->sampler_states[sampler], gl_info);
if (gl_info->supported[EXT_TEXTURE_LOD_BIAS]) if (gl_info->supported[EXT_TEXTURE_LOD_BIAS])
......
...@@ -1920,7 +1920,6 @@ typedef struct IWineD3DBaseTextureImpl ...@@ -1920,7 +1920,6 @@ typedef struct IWineD3DBaseTextureImpl
} IWineD3DBaseTextureImpl; } IWineD3DBaseTextureImpl;
void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, void basetexture_apply_state_changes(IWineD3DBaseTexture *iface,
const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1],
const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1],
const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;
HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment