From c60f296b70c704b4bdec7e792151127782d4dad9 Mon Sep 17 00:00:00 2001 From: Jason Green Date: Fri, 26 May 2006 09:22:14 -0400 Subject: [PATCH] wined3d: Fix regression introduced by recent multitexture patch. --- dlls/wined3d/drawprim.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 9f5994ac4c1..003eac93359 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -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)); } } }