system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-02 05:15:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

wined3d: Fix regression introduced by recent multitexture patch.

Browse source
This commit is contained in:
Jason Green 2006-05-26 09:22:14 -04:00 committed by Alexandre Julliard
parent ac30d46b69
commit c60f296b70
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/wined3d/drawprim.c
View file

@ -1193,7 +1193,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData
}
/* Select the correct texture stage */
GL_EXTCALL(glClientActiveTextureARB(textureNo));
GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + textureNo));
if (This->stateBlock->textures[textureNo] != NULL) {
int coordIdx = This->stateBlock->textureState[textureNo][D3DTSS_TEXCOORDINDEX];
TRACE("Setting up texture %u, cordindx %u, data %p\n", textureNo, coordIdx, sd->u.s.texCoords[coordIdx].lpData);
@ -1201,12 +1201,12 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData
if (coordIdx >= MAX_TEXTURES) {
VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo));
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
GL_EXTCALL(glMultiTexCoord4fARB(textureNo, 0, 0, 0, 1));
GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1));
} else if (sd->u.s.texCoords[coordIdx].lpData == NULL) {
VTRACE(("Bound texture but no texture coordinates supplied, so skipping\n"));
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
GL_EXTCALL(glMultiTexCoord4fARB(textureNo, 0, 0, 0, 1));
GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1));
} else {
@ -1217,7 +1217,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData
} else {
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
GL_EXTCALL(glMultiTexCoord4fARB(textureNo, 0, 0, 0, 1));
GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1));
}
}
}