June 2007 - Wine-commits - list.winehq.org

Misha Koshelev : setupapi: Simplify code as native setupapi does not handle quoted paths.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 0e369586df31a5e0f702d7333082ce67f70c99d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e369586df31a5e0f702d7333… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jun 22 17:32:56 2007 -0500 setupapi: Simplify code as native setupapi does not handle quoted paths. --- dlls/setupapi/install.c | 45 +++------------------------------------- dlls/setupapi/tests/install.c | 2 +- 2 files changed, 5 insertions(+), 42 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index b53b266..ca17b64 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1001,9 +1001,9 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I #endif static const WCHAR nt_genericW[] = {'.','n','t',0}; - WCHAR *s, *d, *path, section[MAX_PATH + sizeof(nt_platformW)/sizeof(WCHAR)]; + WCHAR *s, *path, section[MAX_PATH + sizeof(nt_platformW)/sizeof(WCHAR)]; void *callback_context; - UINT mode, in_quotes, bcount; + UINT mode; HINF hinf; TRACE("hwnd %p, handle %p, cmdline %s\n", hwnd, handle, debugstr_w(cmdline)); @@ -1015,47 +1015,10 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I while (*s == ' ') s++; mode = atoiW( s ); + /* quoted paths are not allowed on native, the rest of the command line is taken as the path */ if (!(s = strchrW( s, ' ' ))) return; while (*s == ' ') s++; - - /* The inf path may be quoted. Code adapted from CommandLineToArgvW() */ - bcount=0; - in_quotes=0; - path=d=s; - while (*s) - { - if (*s==0) { - /* end of this command line argument */ - break; - } else if (*s=='\\') { - /* '\\' */ - *d++=*s++; - bcount++; - } else if (*s=='"') { - /* '"' */ - if ((bcount & 1)==0) { - /* Preceded by an even number of '\', this is half that - * number of '\', plus a quote which we erase. - */ - d-=bcount/2; - in_quotes=!in_quotes; - s++; - } else { - /* Preceded by an odd number of '\', this is half that - * number of '\' followed by a '"' - */ - d=d-bcount/2-1; - *d++='"'; - s++; - } - bcount=0; - } else { - /* a regular character */ - *d++=*s++; - bcount=0; - } - } - *d=0; + path = s; hinf = SetupOpenInfFileW( path, NULL, INF_STYLE_WIN4, NULL ); if (hinf == INVALID_HANDLE_VALUE) return; diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 5cecd97..124f831 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -124,7 +124,7 @@ static void test_cmdline(void) ok_cmdline("DefaultInstall", 128, path, TRUE); sprintf(path, "\"%s\\%s\"", CURR_DIR, infwithspaces); - todo_wine ok_cmdline("DefaultInstall", 128, path, FALSE); + ok_cmdline("DefaultInstall", 128, path, FALSE); ok(DeleteFile(infwithspaces), "Expected source inf to exist, last error was %d\n", GetLastError()); }

1 0

Michael Stefaniuc : msvcrt: Do not use wide character constants.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: ec4936a6a36064ec08e32db90c2f5ebeef59c1b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4936a6a36064ec08e32db90… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 22 23:39:31 2007 +0200 msvcrt: Do not use wide character constants. --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/scanf.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 14b7311..1be1a10 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2764,7 +2764,7 @@ int CDECL MSVCRT_fputws(const MSVCRT_wchar_t *s, MSVCRT_FILE* file) return MSVCRT_fwrite(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; for (i=0; i<len; i++) { - if ((s[i] == L'\n') && (MSVCRT_fputc('\r', file) == MSVCRT_EOF)) + if ((s[i] == '\n') && (MSVCRT_fputc('\r', file) == MSVCRT_EOF)) return MSVCRT_WEOF; if (MSVCRT_fputwc(s[i], file) == MSVCRT_WEOF) return MSVCRT_WEOF; diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index c035845..c51c5ab 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -50,10 +50,10 @@ static int char2digit(char c, int base) { * given base, or -1 if the given character is not a digit of the base. */ static int wchar2digit(MSVCRT_wchar_t c, int base) { - if ((c>=L'0') && (c<=L'9') && (c<=L'0'+base-1)) return (c-L'0'); + if ((c>='0') && (c<='9') && (c<='0'+base-1)) return (c-'0'); if (base<=10) return -1; - if ((c>=L'A') && (c<=L'Z') && (c<=L'A'+base-11)) return (c-L'A'+10); - if ((c>=L'a') && (c<=L'z') && (c<=L'a'+base-11)) return (c-L'a'+10); + if ((c>='A') && (c<='Z') && (c<='A'+base-11)) return (c-'A'+10); + if ((c>='a') && (c<='z') && (c<='a'+base-11)) return (c-'a'+10); return -1; }

1 0

Michael Stefaniuc : winealsa.drv: Fix missing unlock on the error path. Found by Smatch.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 399a297b1969998704b86264cbb53ca34dbf5bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=399a297b1969998704b86264c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 22 23:30:57 2007 +0200 winealsa.drv: Fix missing unlock on the error path. Found by Smatch. --- dlls/winealsa.drv/dsoutput.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 57b8968..9fc5020 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -459,6 +459,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, if (!This->pcm) { FIXME("Bad pointer for pcm: %p\n", This->pcm); + LeaveCriticalSection(&This->pcm_crst); return DSERR_GENERIC; }

1 0

Michael Stefaniuc : dsound: Fix missing unlock on an error path. Found by Smatch.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 2323e79e369af17cc456cf5f9c46fce957574146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2323e79e369af17cc456cf5f9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 22 23:29:06 2007 +0200 dsound: Fix missing unlock on an error path. Found by Smatch. --- dlls/dsound/primary.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index c3c0424..0068e5a 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -639,6 +639,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition( hres = DSOUND_PrimaryGetPosition(device, playpos, writepos); if (hres != DS_OK) { WARN("DSOUND_PrimaryGetPosition failed\n"); + LeaveCriticalSection(&(device->mixlock)); return hres; } if (writepos) {

1 0

H. Verbeet : wined3d: Remove the sharing of mapping code for fixed function and pixel shader samplers .
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 10ffa291e2751a1de75ebc0f389a83256f8b3d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ffa291e2751a1de75ebc0f3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Jun 22 20:43:38 2007 +0200 wined3d: Remove the sharing of mapping code for fixed function and pixel shader samplers. --- dlls/wined3d/device.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dc5343b..ff4bfcc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3214,6 +3214,19 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { device_update_fixed_function_usage_map(This); + if (This->stateBlock->lowest_disabled_stage <= GL_LIMITS(textures)) { + for (i = 0; i < MAX_SAMPLERS; ++i) { + if (This->texUnitMap[i] != i) { + device_map_stage(This, i, i); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); + if (i < MAX_TEXTURES) { + markTextureStagesDirty(This, i); + } + } + } + return; + } + /* No pixel shader, and we do not have enough texture units available. Try to skip NULL textures * First, see if we can succeed at all */ @@ -3266,7 +3279,7 @@ void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { * -> Whith a 1:1 mapping oneToOneTexUnitMap is set to avoid checking MAX_SAMPLERS array * entries to make pixel shaders cheaper. MAX_SAMPLERS will be 128 in dx10 */ - if(This->stateBlock->pixelShader || This->stateBlock->lowest_disabled_stage <= GL_LIMITS(textures)) { + if (This->stateBlock->pixelShader) { if(This->oneToOneTexUnitMap) { TRACE("Not touching 1:1 map\n"); return;

1 0

H. Verbeet : wined3d: Split of the mapping of pixel shader samplers from IWineD3DDeviceImpl_FindTexUnitMap ().
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: a7e466991009f6b49fa3a71d9b23f308af7f3a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e466991009f6b49fa3a71d9… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Jun 22 20:43:42 2007 +0200 wined3d: Split of the mapping of pixel shader samplers from IWineD3DDeviceImpl_FindTexUnitMap(). --- dlls/wined3d/device.c | 38 +++++++++++++++++--------------------- 1 files changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ff4bfcc..db26348 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3266,8 +3266,22 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { } } +static void device_map_psamplers(IWineD3DDeviceImpl *This) { + int i; + + for (i = 0; i < MAX_SAMPLERS; ++i) { + if (This->texUnitMap[i] != i) { + device_map_stage(This, i, i); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); + if (i < MAX_TEXTURES) { + markTextureStagesDirty(This, i); + } + } + } +} + void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { - DWORD i; + BOOL ps = use_ps(This); /* This code can assume that GL_NV_register_combiners are supported, otherwise * it is never called. * @@ -3276,27 +3290,9 @@ void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { * that would be really messy and require shader recompilation * -> When the mapping of a stage is changed, sampler and ALL texture stage states have * to be reset. Because of that try to work with a 1:1 mapping as much as possible - * -> Whith a 1:1 mapping oneToOneTexUnitMap is set to avoid checking MAX_SAMPLERS array - * entries to make pixel shaders cheaper. MAX_SAMPLERS will be 128 in dx10 */ - if (This->stateBlock->pixelShader) { - if(This->oneToOneTexUnitMap) { - TRACE("Not touching 1:1 map\n"); - return; - } - TRACE("Restoring 1:1 texture unit mapping\n"); - /* Restore a 1:1 mapping */ - for(i = 0; i < MAX_SAMPLERS; i++) { - if(This->texUnitMap[i] != i) { - device_map_stage(This, i, i); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); - if (i < MAX_TEXTURES) { - markTextureStagesDirty(This, i); - } - } - } - This->oneToOneTexUnitMap = TRUE; - return; + if (ps) { + device_map_psamplers(This); } else { device_map_fixed_function_samplers(This); }

1 0

H. Verbeet : wined3d: Keep track of what fixed function texture stages are in use.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: b1579b37ea2d3a314dac87a98a3bc9c55fb22dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1579b37ea2d3a314dac87a98… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Jun 22 20:43:24 2007 +0200 wined3d: Keep track of what fixed function texture stages are in use. --- dlls/wined3d/device.c | 13 +++++++++++-- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0b02dd2..23beae5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3201,6 +3201,14 @@ static void device_map_stage(IWineD3DDeviceImpl *This, int stage, int unit) { } } +static void device_update_fixed_function_usage_map(IWineD3DDeviceImpl *This) { + int i; + + for (i = 0; i < MAX_TEXTURES; ++i) { + This->fixed_function_usage_map[i] = This->stateBlock->textures[i] ? TRUE : FALSE; + } +} + void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { DWORD i, tex; /* This code can assume that GL_NV_register_combiners are supported, otherwise @@ -3233,12 +3241,13 @@ void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { This->oneToOneTexUnitMap = TRUE; return; } else { + device_update_fixed_function_usage_map(This); /* No pixel shader, and we do not have enough texture units available. Try to skip NULL textures * First, see if we can succeed at all */ tex = 0; for(i = 0; i < This->stateBlock->lowest_disabled_stage; i++) { - if(This->stateBlock->textures[i] == NULL) tex++; + if (!This->fixed_function_usage_map[i]) ++tex; } if(GL_LIMITS(textures) + tex < This->stateBlock->lowest_disabled_stage) { @@ -3252,7 +3261,7 @@ void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { WARN("Non 1:1 mapping UNTESTED!\n"); for(i = 0; i < This->stateBlock->lowest_disabled_stage; i++) { /* Skip NULL textures */ - if (!This->stateBlock->textures[i]) { + if (!This->fixed_function_usage_map[i]) { /* Map to -1, so the check below doesn't fail if a non-NULL * texture is set on this stage */ TRACE("Mapping texture stage %d to -1\n", i); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index efa8f7b..2710669 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -724,6 +724,7 @@ struct IWineD3DDeviceImpl /* With register combiners we can skip junk texture stages */ DWORD texUnitMap[MAX_SAMPLERS]; DWORD rev_tex_unit_map[MAX_SAMPLERS]; + BOOL fixed_function_usage_map[MAX_TEXTURES]; BOOL oneToOneTexUnitMap; /* Stream source management */

1 0

H. Verbeet : wined3d: Split of the mapping of fixed function samplers from IWineD3DDeviceImpl_FindTexUnitMap ().
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 2aa891c17572d7cda8353a81a4699f14fbbe6054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa891c17572d7cda8353a81a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Jun 22 20:43:29 2007 +0200 wined3d: Split of the mapping of fixed function samplers from IWineD3DDeviceImpl_FindTexUnitMap(). --- dlls/wined3d/device.c | 85 ++++++++++++++++++++++++++---------------------- 1 files changed, 46 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 23beae5..dc5343b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3209,8 +3209,52 @@ static void device_update_fixed_function_usage_map(IWineD3DDeviceImpl *This) { } } +static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { + int i, tex; + + device_update_fixed_function_usage_map(This); + + /* No pixel shader, and we do not have enough texture units available. Try to skip NULL textures + * First, see if we can succeed at all + */ + tex = 0; + for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { + if (!This->fixed_function_usage_map[i]) ++tex; + } + + if (GL_LIMITS(textures) + tex < This->stateBlock->lowest_disabled_stage) { + FIXME("Too many bound textures to support the combiner settings\n"); + return; + } + + /* Now work out the mapping */ + tex = 0; + This->oneToOneTexUnitMap = FALSE; + WARN("Non 1:1 mapping UNTESTED!\n"); + for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { + /* Skip NULL textures */ + if (!This->fixed_function_usage_map[i]) { + /* Map to -1, so the check below doesn't fail if a non-NULL + * texture is set on this stage */ + TRACE("Mapping texture stage %d to -1\n", i); + device_map_stage(This, i, -1); + + continue; + } + + TRACE("Mapping texture stage %d to unit %d\n", i, tex); + if (This->texUnitMap[i] != tex) { + device_map_stage(This, i, tex); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); + markTextureStagesDirty(This, i); + } + + ++tex; + } +} + void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { - DWORD i, tex; + DWORD i; /* This code can assume that GL_NV_register_combiners are supported, otherwise * it is never called. * @@ -3241,44 +3285,7 @@ void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { This->oneToOneTexUnitMap = TRUE; return; } else { - device_update_fixed_function_usage_map(This); - /* No pixel shader, and we do not have enough texture units available. Try to skip NULL textures - * First, see if we can succeed at all - */ - tex = 0; - for(i = 0; i < This->stateBlock->lowest_disabled_stage; i++) { - if (!This->fixed_function_usage_map[i]) ++tex; - } - - if(GL_LIMITS(textures) + tex < This->stateBlock->lowest_disabled_stage) { - FIXME("Too many bound textures to support the combiner settings\n"); - return; - } - - /* Now work out the mapping */ - tex = 0; - This->oneToOneTexUnitMap = FALSE; - WARN("Non 1:1 mapping UNTESTED!\n"); - for(i = 0; i < This->stateBlock->lowest_disabled_stage; i++) { - /* Skip NULL textures */ - if (!This->fixed_function_usage_map[i]) { - /* Map to -1, so the check below doesn't fail if a non-NULL - * texture is set on this stage */ - TRACE("Mapping texture stage %d to -1\n", i); - device_map_stage(This, i, -1); - - continue; - } - - TRACE("Mapping texture stage %d to unit %d\n", i, tex); - if(This->texUnitMap[i] != tex) { - device_map_stage(This, i, tex); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); - markTextureStagesDirty(This, i); - } - - ++tex; - } + device_map_fixed_function_samplers(This); } }

1 0

Paul Vriens : mscms/tests: Fix wrong test for failure.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 761ec5e52ba8fca4d247833f29c88e432afe28ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=761ec5e52ba8fca4d247833f2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 22 16:44:54 2007 +0200 mscms/tests: Fix wrong test for failure. --- dlls/mscms/tests/profile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index cdc6ea4..a412c44 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -554,9 +554,9 @@ static void check_registry(void) } res = RegQueryInfoKeyA(hkIcmKey, NULL, NULL, NULL, NULL, NULL, NULL, &dwValCount, NULL, NULL, NULL, NULL); - if (!res) + if (res) { - trace("RegQueryInfoKeyA() failed\n"); + trace("RegQueryInfoKeyA() failed : %d\n", res); return; }

1 0

H. Verbeet : wined3d: Keep track of what stage a texturing unit is mapped to.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: b928cadde8cbf5ad1bee76047217f91901c3027f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b928cadde8cbf5ad1bee76047… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Jun 22 20:43:19 2007 +0200 wined3d: Keep track of what stage a texturing unit is mapped to. --- dlls/wined3d/device.c | 29 +++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f7d9042..0b02dd2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1811,7 +1811,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR /* Initialize the texture unit mapping to a 1:1 mapping */ for(state = 0; state < MAX_SAMPLERS; state++) { - This->texUnitMap[state] = state; + if (state < GL_LIMITS(samplers)) { + This->texUnitMap[state] = state; + This->rev_tex_unit_map[state] = state; + } else { + This->texUnitMap[state] = -1; + This->rev_tex_unit_map[state] = -1; + } } This->oneToOneTexUnitMap = TRUE; @@ -3180,6 +3186,21 @@ static inline void markTextureStagesDirty(IWineD3DDeviceImpl *This, DWORD stage) } } +static void device_map_stage(IWineD3DDeviceImpl *This, int stage, int unit) { + int i = This->rev_tex_unit_map[unit]; + int j = This->texUnitMap[stage]; + + This->texUnitMap[stage] = unit; + if (i != -1 && i != stage) { + This->texUnitMap[i] = -1; + } + + This->rev_tex_unit_map[unit] = stage; + if (j != -1 && j != unit) { + This->rev_tex_unit_map[j] = -1; + } +} + void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { DWORD i, tex; /* This code can assume that GL_NV_register_combiners are supported, otherwise @@ -3202,7 +3223,7 @@ void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { /* Restore a 1:1 mapping */ for(i = 0; i < MAX_SAMPLERS; i++) { if(This->texUnitMap[i] != i) { - This->texUnitMap[i] = i; + device_map_stage(This, i, i); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); if (i < MAX_TEXTURES) { markTextureStagesDirty(This, i); @@ -3235,14 +3256,14 @@ void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { /* Map to -1, so the check below doesn't fail if a non-NULL * texture is set on this stage */ TRACE("Mapping texture stage %d to -1\n", i); - This->texUnitMap[i] = -1; + device_map_stage(This, i, -1); continue; } TRACE("Mapping texture stage %d to unit %d\n", i, tex); if(This->texUnitMap[i] != tex) { - This->texUnitMap[i] = tex; + device_map_stage(This, i, tex); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); markTextureStagesDirty(This, i); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 458e7ff..efa8f7b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -723,6 +723,7 @@ struct IWineD3DDeviceImpl /* With register combiners we can skip junk texture stages */ DWORD texUnitMap[MAX_SAMPLERS]; + DWORD rev_tex_unit_map[MAX_SAMPLERS]; BOOL oneToOneTexUnitMap; /* Stream source management */

1 0