Skip to content

W
wine-winehq
Commit aced8de8 authored by H. Verbeet's avatar H. Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Skip WINED3DTSS_TEXCOORDINDEX state application for stages that aren't…

wined3d: Skip WINED3DTSS_TEXCOORDINDEX state application for stages that aren't mapped to a texture unit.
parent c7fad607
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
dlls/wined3d/state.c
View file @ aced8de8
...@@ -1499,13 +1499,18 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock) { ...@@ -1499,13 +1499,18 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock) {
static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock) { static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock) {
DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE;
DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage];
if (mapped_stage == -1) {
TRACE("No texture unit mapped to stage %d. Skipping texture coordinates.\n", stage);
return;
}
if (GL_SUPPORT(ARB_MULTITEXTURE)) { if (GL_SUPPORT(ARB_MULTITEXTURE)) {
/* TODO: register combiners! */
if(stage >= GL_LIMITS(sampler_stages)) { if(stage >= GL_LIMITS(sampler_stages)) {
return; return;
} }
GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stateblock->wineD3DDevice->texUnitMap[stage])); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage));
checkGLcall("glActiveTextureARB"); checkGLcall("glActiveTextureARB");
} else if (stage > 0) { } else if (stage > 0) {
/* We can't do anything here */ /* We can't do anything here */
......
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