system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-21 09:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Stefan Dösinger 2010-10-31 22:09:38 +01:00 committed by Alexandre Julliard
parent 886193c3b4
commit 5082c57e77
3 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/wined3d/basetexture.c
View file

@ -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;

1
dlls/wined3d/state.c
View file

@ -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])

1
dlls/wined3d/wined3d_private.h
View file

@ -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;