December 2006 - Wine-commits

Christoph Frick : dinput: Set the correct size for the old dinput joystick.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: b0eb9d0b8990e13b5744d4bfd9ed286c438d987e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0eb9d0b8990e13b5744d4bfd… Author: Christoph Frick <frick(a)sc-networks.de> Date: Wed Dec 20 12:28:07 2006 +0100 dinput: Set the correct size for the old dinput joystick. This also reverts my previous patch as this is the real cause for the problems with Grand Prix Legends. --- dlls/dinput/data_formats.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/data_formats.c b/dlls/dinput/data_formats.c index bc49263..1f25556 100644 --- a/dlls/dinput/data_formats.c +++ b/dlls/dinput/data_formats.c @@ -74,7 +74,7 @@ const DIDATAFORMAT c_dfDIJoystick = { sizeof(DIDATAFORMAT), sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, - sizeof(DIJOYSTATE2), + sizeof(DIJOYSTATE), numObjects(dfDIJoystick), (LPDIOBJECTDATAFORMAT)dfDIJoystick }; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index aea00df..4cce222 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -899,7 +899,7 @@ static HRESULT WINAPI JoystickAImpl_GetC return E_POINTER; } - if (lpDIDevCaps->dwSize < sizeof(DIDEVCAPS)) { + if (lpDIDevCaps->dwSize != sizeof(DIDEVCAPS)) { WARN("invalid argument\n"); return DIERR_INVALIDPARAM; }

1 0

Christoph Frick : dinput: Drop magic int.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: e4a6562937037e4a918a587d24e635c1c1e658ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a6562937037e4a918a587d2… Author: Christoph Frick <frick(a)sc-networks.de> Date: Wed Dec 20 12:28:58 2006 +0100 dinput: Drop magic int. --- dlls/dinput/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 6b05ed6..31e05a5 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -381,7 +381,7 @@ HRESULT create_DataFormat(LPCDIDATAFORMA (/* Then check if it accepts any instance id, and if not, if it matches Wine's * instance id. */ - (DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == 0xFFFF) || + ((asked_format->rgodf[j].dwType & DIDFT_INSTANCEMASK) == DIDFT_ANYINSTANCE) || (DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == 0x00FF) || /* This is mentionned in no DX docs, but it works fine - tested on WinXP */ (DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == DIDFT_GETINSTANCE(format->wine_df->rgodf[i].dwType))) &&

1 0

Stefan Dösinger : wined3d: Catch nop pixel shader changes.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: a008003ccc330a69212e4fd6c1c5e5780bd68c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a008003ccc330a69212e4fd6c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:22:48 2006 +0100 wined3d: Catch nop pixel shader changes. --- dlls/wined3d/device.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1bc25c2..dd42bf7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3700,6 +3700,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3D_OK; } + if(pShader == oldShader) { + TRACE("App is setting the old pixel shader over, nothing to do\n"); + return WINED3D_OK; + } + TRACE("(%p) : setting pShader(%p)\n", This, pShader); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADER); return WINED3D_OK; @@ -6033,10 +6038,13 @@ static void device_reapply_stateblock(IW /* Temporaryily mark all render states dirty to force reapplication * until the context management for is integrated with the state management + * The same for the pixel shader, sampler states and texture stage states are marked + * dirty my StateBlock::Apply already */ for(i = 1; i < WINEHIGHEST_RENDER_STATE; i++) { IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(i)); } + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADER); /* Restore recording */ This->isRecordingState = oldRecording;

1 0

Stefan Dösinger : wined3d: Add pixel shaders to the state table.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 22e2a5aca5514f48970239d652cc24d4385677e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e2a5aca5514f48970239d65… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:22:19 2006 +0100 wined3d: Add pixel shaders to the state table. --- dlls/wined3d/device.c | 31 ++++------------------ dlls/wined3d/drawprim.c | 8 ----- dlls/wined3d/state.c | 56 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 6 +++- 4 files changed, 67 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 833c84b..1bc25c2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3690,37 +3690,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl if (NULL != pShader) { IWineD3DPixelShader_AddRef(pShader); - if(oldShader == NULL) { - /* Fixed function color ops deactivate the texture dimensions from the first stage which has colorop = disable - * Pixel shaders require that this is enabled, so dirtify all samplers, they will enable the dimensions. - * do not dirtify the colorop - it won't do anything when a ashader is bound - * This is temporary until pixel shaders are handled by the state table too - */ - int i; - for(i = 0; i < MAX_SAMPLERS; i++) { - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); - } - } } if (NULL != oldShader) { IWineD3DPixelShader_Release(oldShader); - if(pShader == NULL) { - /* Fixed function pipeline color args conflict with pixel shader setup, so we do not apply them when a pshader is - * bound. Due to that we have to reapply all color ops when disabling pixel shaders. - * When pixel shaders are handled by the state table too, the pshader function will take care for that, and this - * will also handle draw -> SetPixelShader(NULL) -> SetPixelShader(!= NULL) -> draw cases better - */ - int i; - for(i = 0; i < MAX_TEXTURES; i++) { - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP)); - } - } + } + + if (This->isRecordingState) { + TRACE("Recording... not performing anything\n"); + return WINED3D_OK; } TRACE("(%p) : setting pShader(%p)\n", This, pShader); - /** - * TODO: merge HAL shaders context switching from prototype - */ + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADER); return WINED3D_OK; } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c550d04..a050bb2 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1781,14 +1781,6 @@ inline static void drawPrimitiveDrawStri useDrawStridedSlow = TRUE; } - if(usePixelShaderFunction) { - /* We compile the shader here because it depends on the texture stage state - * setup of the bound textures. If the shader is already compiled and the texture stage - * state setup matches the program this function will do nothing - */ - IWineD3DPixelShader_CompileShader(This->stateBlock->pixelShader); - } - /* Make any shaders active */ This->shader_backend->shader_select(iface, usePixelShaderFunction, useVertexShaderFunction); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 89e2e2b..16057c4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1707,6 +1707,60 @@ static void sampler(DWORD state, IWineD3 } } +static void pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock) { + int i; + + if(stateblock->pixelShader && ((IWineD3DPixelShaderImpl *) stateblock->pixelShader)->baseShader.function != NULL) { + if(!stateblock->wineD3DDevice->last_was_pshader) { + /* Former draw without a pixel shader, some samplers + * may be disabled because of WINED3DTSS_COLOROP = WINED3DTOP_DISABLE + * make sure to enable them + */ + for(i=0; i < MAX_SAMPLERS; i++) { + if(!isStateDirty(stateblock->wineD3DDevice, STATE_SAMPLER(i))) { + sampler(STATE_SAMPLER(i), stateblock); + } + } + } else { + /* Otherwise all samplers were activated by the code above in earlier draws, or by sampler() + * if a different texture was bound. I don't have to do anything. + */ + } + + /* Compile and bind the shader */ + IWineD3DPixelShader_CompileShader(stateblock->pixelShader); + +#if 0 + /* Can't do that here right now, because glsl shaders depend on having both pixel and vertex shader + * setup at the same time. The shader_select call will be done by drawprim until vertex shaders are + * moved to the state table too + */ + stateblock->wineD3DDevice->shader_backend->shader_select( + (IWineD3DDevice *) stateblock->wineD3DDevice, + TRUE, + !stateblock->vertexShader ? FALSE : ((IWineD3DVertexShaderImpl *) stateblock->vertexShader)->baseShader.function != NULL); +#endif + stateblock->wineD3DDevice->last_was_pshader = TRUE; + } else { + /* Disabled the pixel shader - color ops weren't applied + * while it was enabled, so re-apply them. + */ + for(i=0; i < MAX_TEXTURES; i++) { + if(!isStateDirty(stateblock->wineD3DDevice, STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP))) { + tex_colorop(STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP), stateblock); + } + } + stateblock->wineD3DDevice->last_was_pshader = FALSE; + +#if 0 + stateblock->wineD3DDevice->shader_backend->shader_select( + (IWineD3DDevice *) stateblock->wineD3DDevice, + FALSE, + !stateblock->vertexShader ? FALSE : ((IWineD3DVertexShaderImpl *) stateblock->vertexShader)->baseShader.function != NULL); +#endif + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -2204,4 +2258,6 @@ const struct StateEntry StateTable[] = { /*13, Sampler 13 */ STATE_SAMPLER(13), sampler }, { /*14, Sampler 14 */ STATE_SAMPLER(14), sampler }, { /*15, Sampler 15 */ STATE_SAMPLER(15), sampler }, + /* Pixel shader */ + { /* , Pixel Shader */ STATE_PIXELSHADER, pixelshader }, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 360ed7b..1df81bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -420,7 +420,10 @@ typedef void (*APPLYSTATEFUNC)(DWORD sta #define STATE_SAMPLER(num) (STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE) + 1 + (num)) #define STATE_IS_SAMPLER(num) ((num) >= STATE_SAMPLER(0) && (num) <= STATE_SAMPLER(MAX_SAMPLERS - 1)) -#define STATE_HIGHEST (STATE_SAMPLER(MAX_SAMPLERS - 1)) +#define STATE_PIXELSHADER (STATE_SAMPLER(MAX_SAMPLERS - 1) + 1) +#define STATE_IS_PIXELSHADER(a) ((a) == STATE_PIXELSHADER) + +#define STATE_HIGHEST (STATE_PIXELSHADER) struct StateEntry { @@ -564,6 +567,7 @@ typedef struct IWineD3DDeviceImpl BOOL texture_shader_active; /* TODO: Confirm use is correct */ BOOL last_was_notclipped; BOOL untransformed; + BOOL last_was_pshader; /* State block related */ BOOL isRecordingState;

1 0

Stefan Dösinger : wined3d: Catch nop sampler changes.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 8365b2819ad5e9ab1e820876a35a50ba9f44532b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8365b2819ad5e9ab1e820876a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:17:17 2006 +0100 wined3d: Catch nop sampler changes. --- dlls/wined3d/device.c | 13 ++++++++++++- dlls/wined3d/stateblock.c | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6230146..833c84b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3368,6 +3368,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl static HRESULT WINAPI IWineD3DDeviceImpl_SetSamplerState(IWineD3DDevice *iface, DWORD Sampler, WINED3DSAMPLERSTATETYPE Type, DWORD Value) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + DWORD oldValue = This->stateBlock->samplerState[Sampler][Type]; + /** * SetSampler is designed to allow for more than the standard up to 8 textures * and Geforce has stopped supporting more than 6 standard textures in openGL. @@ -3401,6 +3403,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3D_OK; } + if(oldValue == Value) { + TRACE("Application is setting the old value over, nothing to do\n"); + return WINED3D_OK; + } + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(Sampler)); return WINED3D_OK; @@ -4487,7 +4494,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl This->stateBlock->textureDimensions[Stage] = IWineD3DBaseTexture_GetTextureDimensions(pTexture); } - oldTexture = This->updateStateBlock->textures[Stage]; TRACE("GL_LIMITS %d\n",GL_LIMITS(sampler_stages)); TRACE("(%p) : oldtexture(%p)\n", This,oldTexture); @@ -4502,6 +4508,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3D_OK; } + if(oldTexture == pTexture) { + TRACE("App is setting the same texture again, nothing to do\n"); + return WINED3D_OK; + } + /** NOTE: MSDN says that setTexture increases the reference count, * and the the application nust set the texture back to null (or have a leaky application), * This means we should pass the refcount up to the parent diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4dd182c..afc582d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -756,7 +756,8 @@ should really perform a delta so that on ((IWineD3DDeviceImpl *)pDevice)->stateBlock->changed.samplerState[j][i] = TRUE; } } - + /* SetTexture catches nop changes, so the above call does not assure that the sampler is updated */ + IWineD3DDeviceImpl_MarkStateDirty((IWineD3DDeviceImpl *)pDevice, STATE_SAMPLER(j)); } } else if (This->blockType == WINED3DSBT_PIXELSTATE) {

1 0

Stefan Dösinger : wined3d: Move samplers to the state table.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 666b5077668035b360d85799cb2099ec928c39cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=666b5077668035b360d85799c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:26:39 2006 +0100 wined3d: Move samplers to the state table. --- dlls/wined3d/device.c | 46 +++++++++++++-- dlls/wined3d/drawprim.c | 126 ---------------------------------------- dlls/wined3d/state.c | 92 ++++++++++++++++++++++++----- dlls/wined3d/surface.c | 16 ++++- dlls/wined3d/wined3d_private.h | 3 +- 5 files changed, 131 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=666b5077668035b360d85…

1 0

Stefan Dösinger : wined3d: Add empty sampler entries to the state table.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 2d1aeb43827cb1941f09f4184eaf544147466f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1aeb43827cb1941f09f4184… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:14:07 2006 +0100 wined3d: Add empty sampler entries to the state table. --- dlls/wined3d/state.c | 17 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 6 +++++- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a7772f5..8aeafb8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2127,4 +2127,21 @@ const struct StateEntry StateTable[] = { /*7, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*7, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*7, 32, WINED3DTSS_CONSTANT */ 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }, + /* Sampler states */ + { /* 0, Sampler 0 */ STATE_SAMPLER(0), state_undefined }, + { /* 1, Sampler 1 */ STATE_SAMPLER(1), state_undefined }, + { /* 2, Sampler 2 */ STATE_SAMPLER(2), state_undefined }, + { /* 3, Sampler 3 */ STATE_SAMPLER(3), state_undefined }, + { /* 4, Sampler 3 */ STATE_SAMPLER(4), state_undefined }, + { /* 5, Sampler 5 */ STATE_SAMPLER(5), state_undefined }, + { /* 6, Sampler 6 */ STATE_SAMPLER(6), state_undefined }, + { /* 7, Sampler 7 */ STATE_SAMPLER(7), state_undefined }, + { /* 8, Sampler 8 */ STATE_SAMPLER(8), state_undefined }, + { /* 9, Sampler 9 */ STATE_SAMPLER(9), state_undefined }, + { /*10, Sampler 10 */ STATE_SAMPLER(10), state_undefined }, + { /*11, Sampler 11 */ STATE_SAMPLER(11), state_undefined }, + { /*12, Sampler 12 */ STATE_SAMPLER(12), state_undefined }, + { /*13, Sampler 13 */ STATE_SAMPLER(13), state_undefined }, + { /*14, Sampler 14 */ STATE_SAMPLER(14), state_undefined }, + { /*15, Sampler 15 */ STATE_SAMPLER(15), state_undefined }, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6c75706..95bdbde 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -416,7 +416,11 @@ typedef void (*APPLYSTATEFUNC)(DWORD sta #define STATE_TEXTURESTAGE(stage, num) (STATE_RENDER(WINEHIGHEST_RENDER_STATE) + (stage) * WINED3D_HIGHEST_TEXTURE_STATE + (num)) #define STATE_IS_TEXTURESTAGE(a) ((a) >= STATE_TEXTURESTAGE(0, 1) && (a) <= STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE)) -#define STATE_HIGHEST (STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE)) +/* + 1 because samplers start with 0 */ +#define STATE_SAMPLER(num) (STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE) + 1 + (num)) +#define STATE_IS_SAMPLER(num) ((num) >= STATE_SAMPLER(0) && (num) <= STATE_SAMPLER(MAX_SAMPLERS - 1)) + +#define STATE_HIGHEST (STATE_SAMPLER(MAX_SAMPLERS - 1)) struct StateEntry {

1 0

Stefan Dösinger : wined3d: Make a WINED3DTSS_RESULTARG stub.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 63a8c3c40842048c5636e2820d7672579e755a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a8c3c40842048c5636e2820… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:11:21 2006 +0100 wined3d: Make a WINED3DTSS_RESULTARG stub. --- dlls/wined3d/state.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9a1d647..24056c9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1639,6 +1639,14 @@ static void tex_bumpenvloffset(DWORD sta } } +static void tex_resultarg(DWORD state, IWineD3DStateBlockImpl *stateblock) { + DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; + + if(stateblock->textureState[stage][WINED3DTSS_RESULTARG] != D3DTA_CURRENT) { + ERR("WINED3DTSS_RESULTARG not supported yet\n"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1883,7 +1891,7 @@ const struct StateEntry StateTable[] = { /*0, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*0, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), tex_colorop }, { /*0, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), tex_alphaop }, - { /*0, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(0, WINED3DTSS_RESULTARG), state_undefined }, + { /*0, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(0, WINED3DTSS_RESULTARG), tex_resultarg }, { /*0, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*0, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*0, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -1916,7 +1924,7 @@ const struct StateEntry StateTable[] = { /*1, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*1, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(1, WINED3DTSS_COLOROP), tex_colorop }, { /*1, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(1, WINED3DTSS_ALPHAOP), tex_alphaop }, - { /*1, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(1, WINED3DTSS_RESULTARG), state_undefined }, + { /*1, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(1, WINED3DTSS_RESULTARG), tex_resultarg }, { /*1, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*1, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*1, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -1949,7 +1957,7 @@ const struct StateEntry StateTable[] = { /*2, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*2, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(2, WINED3DTSS_COLOROP), tex_colorop }, { /*2, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(2, WINED3DTSS_ALPHAOP), tex_alphaop }, - { /*2, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(2, WINED3DTSS_RESULTARG), state_undefined }, + { /*2, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(2, WINED3DTSS_RESULTARG), tex_resultarg }, { /*2, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*2, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*2, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -1982,7 +1990,7 @@ const struct StateEntry StateTable[] = { /*3, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*3, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(3, WINED3DTSS_COLOROP), tex_colorop }, { /*3, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(3, WINED3DTSS_ALPHAOP), tex_alphaop }, - { /*3, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(3, WINED3DTSS_RESULTARG), state_undefined }, + { /*3, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(3, WINED3DTSS_RESULTARG), tex_resultarg }, { /*3, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*3, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*3, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -2015,7 +2023,7 @@ const struct StateEntry StateTable[] = { /*4, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*4, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(4, WINED3DTSS_COLOROP), tex_colorop }, { /*4, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(4, WINED3DTSS_ALPHAOP), tex_alphaop }, - { /*4, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(4, WINED3DTSS_RESULTARG), state_undefined }, + { /*4, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(4, WINED3DTSS_RESULTARG), tex_resultarg }, { /*4, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*4, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*4, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -2048,7 +2056,7 @@ const struct StateEntry StateTable[] = { /*5, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*5, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(5, WINED3DTSS_COLOROP), tex_colorop }, { /*5, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(5, WINED3DTSS_ALPHAOP), tex_alphaop }, - { /*5, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(5, WINED3DTSS_RESULTARG), state_undefined }, + { /*5, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(5, WINED3DTSS_RESULTARG), tex_resultarg }, { /*5, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*5, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*5, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -2081,7 +2089,7 @@ const struct StateEntry StateTable[] = { /*6, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*6, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(6, WINED3DTSS_COLOROP), tex_colorop }, { /*6, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(6, WINED3DTSS_ALPHAOP), tex_alphaop }, - { /*6, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(6, WINED3DTSS_RESULTARG), state_undefined }, + { /*6, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(6, WINED3DTSS_RESULTARG), tex_resultarg }, { /*6, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*6, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*6, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -2114,7 +2122,7 @@ const struct StateEntry StateTable[] = { /*7, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*7, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), tex_colorop }, { /*7, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAOP), tex_alphaop }, - { /*7, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(7, WINED3DTSS_RESULTARG), state_undefined }, + { /*7, 28, WINED3DTSS_RESULTARG */ STATE_TEXTURESTAGE(7, WINED3DTSS_RESULTARG), tex_resultarg }, { /*7, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*7, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*7, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined },

1 0

Stefan Dösinger : wined3d: Make WINED3DTSS_CONSTANT a nogl state.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 557b1fa477a29b8b9b684739763819b9119c0da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=557b1fa477a29b8b9b6847397… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:11:28 2006 +0100 wined3d: Make WINED3DTSS_CONSTANT a nogl state. --- dlls/wined3d/state.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 24056c9..a7772f5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1895,7 +1895,7 @@ const struct StateEntry StateTable[] = { /*0, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*0, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*0, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*0, 32, WINED3DTSS_CONSTANT */ STATE_TEXTURESTAGE(0, WINED3DTSS_CONSTANT), state_undefined }, + { /*0, 32, WINED3DTSS_CONSTANT */ 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }, { /*1, 01, WINED3DTSS_COLOROP */ STATE_TEXTURESTAGE(1, WINED3DTSS_COLOROP), tex_colorop }, { /*1, 02, WINED3DTSS_COLORARG1 */ STATE_TEXTURESTAGE(1, WINED3DTSS_COLOROP), tex_colorop }, @@ -1928,7 +1928,7 @@ const struct StateEntry StateTable[] = { /*1, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*1, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*1, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*1, 32, WINED3DTSS_CONSTANT */ STATE_TEXTURESTAGE(1, WINED3DTSS_CONSTANT), state_undefined }, + { /*1, 32, WINED3DTSS_CONSTANT */ 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }, { /*2, 01, WINED3DTSS_COLOROP */ STATE_TEXTURESTAGE(2, WINED3DTSS_COLOROP), tex_colorop }, { /*2, 02, WINED3DTSS_COLORARG1 */ STATE_TEXTURESTAGE(2, WINED3DTSS_COLOROP), tex_colorop }, @@ -1961,7 +1961,7 @@ const struct StateEntry StateTable[] = { /*2, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*2, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*2, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*2, 32, WINED3DTSS_CONSTANT */ STATE_TEXTURESTAGE(2, WINED3DTSS_CONSTANT), state_undefined }, + { /*2, 32, WINED3DTSS_CONSTANT */ 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }, { /*3, 01, WINED3DTSS_COLOROP */ STATE_TEXTURESTAGE(3, WINED3DTSS_COLOROP), tex_colorop }, { /*3, 02, WINED3DTSS_COLORARG1 */ STATE_TEXTURESTAGE(3, WINED3DTSS_COLOROP), tex_colorop }, @@ -1994,7 +1994,7 @@ const struct StateEntry StateTable[] = { /*3, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*3, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*3, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*3, 32, WINED3DTSS_CONSTANT */ STATE_TEXTURESTAGE(3, WINED3DTSS_CONSTANT), state_undefined }, + { /*3, 32, WINED3DTSS_CONSTANT */ 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }, { /*4, 01, WINED3DTSS_COLOROP */ STATE_TEXTURESTAGE(4, WINED3DTSS_COLOROP), tex_colorop }, { /*4, 02, WINED3DTSS_COLORARG1 */ STATE_TEXTURESTAGE(4, WINED3DTSS_COLOROP), tex_colorop }, @@ -2027,7 +2027,7 @@ const struct StateEntry StateTable[] = { /*4, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*4, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*4, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*4, 32, WINED3DTSS_CONSTANT */ STATE_TEXTURESTAGE(4, WINED3DTSS_CONSTANT), state_undefined }, + { /*4, 32, WINED3DTSS_CONSTANT */ 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }, { /*5, 01, WINED3DTSS_COLOROP */ STATE_TEXTURESTAGE(5, WINED3DTSS_COLOROP), tex_colorop }, { /*5, 02, WINED3DTSS_COLORARG1 */ STATE_TEXTURESTAGE(5, WINED3DTSS_COLOROP), tex_colorop }, @@ -2060,7 +2060,7 @@ const struct StateEntry StateTable[] = { /*5, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*5, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*5, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*5, 32, WINED3DTSS_CONSTANT */ STATE_TEXTURESTAGE(5, WINED3DTSS_CONSTANT), state_undefined }, + { /*5, 32, WINED3DTSS_CONSTANT */ 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }, { /*6, 01, WINED3DTSS_COLOROP */ STATE_TEXTURESTAGE(6, WINED3DTSS_COLOROP), tex_colorop }, { /*6, 02, WINED3DTSS_COLORARG1 */ STATE_TEXTURESTAGE(6, WINED3DTSS_COLOROP), tex_colorop }, @@ -2093,7 +2093,7 @@ const struct StateEntry StateTable[] = { /*6, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*6, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*6, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*6, 32, WINED3DTSS_CONSTANT */ STATE_TEXTURESTAGE(6, WINED3DTSS_CONSTANT), state_undefined }, + { /*6, 32, WINED3DTSS_CONSTANT */ 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }, { /*7, 01, WINED3DTSS_COLOROP */ STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), tex_colorop }, { /*7, 02, WINED3DTSS_COLORARG1 */ STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), tex_colorop }, @@ -2126,5 +2126,5 @@ const struct StateEntry StateTable[] = { /*7, 29, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*7, 30, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*7, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*7, 32, WINED3DTSS_CONSTANT */ STATE_TEXTURESTAGE(7, WINED3DTSS_CONSTANT), state_undefined }, + { /*7, 32, WINED3DTSS_CONSTANT */ 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }, };

1 0

Stefan Dösinger : wined3d: Catch nop SetTextureStageState calls.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 7f973c9375b436847177d15d2223d97c81fb59c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f973c9375b436847177d15d2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:12:26 2006 +0100 wined3d: Catch nop SetTextureStageState calls. --- dlls/wined3d/device.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ce72266..3f1b1c4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4355,7 +4355,7 @@ static void WINAPI IWineD3DDeviceImpl_Ap *****/ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *iface, DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type, DWORD Value) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - DWORD oldColorOp = This->updateStateBlock->textureState[Stage][WINED3DTSS_COLOROP]; + DWORD oldValue = This->updateStateBlock->textureState[Stage][Type]; /* FIXME: Handle 3d textures? What if TSS value set before set texture? Need to reapply all values? */ @@ -4376,6 +4376,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3D_OK; } + /* Checked after the assignments to allow proper stateblock recording */ + if(oldValue == Value) { + TRACE("App is setting the old value over, nothing to do\n"); + return WINED3D_OK; + } + if(Stage > This->stateBlock->lowest_disabled_stage && StateTable[STATE_TEXTURESTAGE(0, Type)].representative == STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP)) { /* Colorop change above lowest disabled stage? That won't change anything in the gl setup @@ -4387,7 +4393,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl if(Type == WINED3DTSS_COLOROP) { int i; - if(Value == WINED3DTOP_DISABLE && oldColorOp != WINED3DTOP_DISABLE) { + if(Value == WINED3DTOP_DISABLE && oldValue != WINED3DTOP_DISABLE) { /* Previously enabled stage disabled now. Make sure to dirtify all enabled stages above Stage, * they have to be disabled * @@ -4399,7 +4405,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl } This->stateBlock->lowest_disabled_stage = Stage; TRACE("New lowest disabled: %d\n", Stage); - } else if(Value != WINED3DTOP_DISABLE && oldColorOp == WINED3DTOP_DISABLE) { + } else if(Value != WINED3DTOP_DISABLE && oldValue == WINED3DTOP_DISABLE) { /* Previously disabled stage enabled. Stages above it may need enabling * stage must be lowest_disabled_stage here, if it's bigger success is returned above, * and stages below the lowest disabled stage can't be enabled(because they are enabled already).

1 0