December 2006 - Wine-Commits

Christoph Frick : dinput: Silently ignore DIPROP_CALIBRATIONMODE.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: ba1ef69a419bf5842e0a4e731bb00e185b44d9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba1ef69a419bf5842e0a4e731… Author: Christoph Frick <frick(a)sc-networks.de> Date: Mon Dec 11 10:04:02 2006 +0100 dinput: Silently ignore DIPROP_CALIBRATIONMODE. --- dlls/dinput/joystick_linuxinput.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 195fa9c..0ba4877 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1071,6 +1071,11 @@ static HRESULT WINAPI JoystickAImpl_SetP fake_current_js_state(This); break; } + case (DWORD)DIPROP_CALIBRATIONMODE: { + LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; + FIXME("DIPROP_CALIBRATIONMODE(%d)\n", pd->dwData); + break; + } default: return IDirectInputDevice2AImpl_SetProperty(iface, rguid, ph); }

1 0

Vitaliy Margolen : dinput: Remove incorrect assumption about format.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 5b520ff6dfea9ab4292fbc4127ca052efb85ec15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b520ff6dfea9ab4292fbc412… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 10 17:10:34 2006 -0700 dinput: Remove incorrect assumption about format. --- dlls/dinput/device.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index fd38baa..8b97875 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -353,14 +353,8 @@ DataFormat *create_DataFormat(const DIDA else dt[index].size = sizeof(DWORD); dt[index].offset_in = wine_format->rgodf[i].dwOfs; - if (asked_format->rgodf[j].dwOfs < next) { - WARN("bad format: dwOfs=%d, changing to %d\n", asked_format->rgodf[j].dwOfs, next); - dt[index].offset_out = next; - offset[i] = next; - } else { - dt[index].offset_out = asked_format->rgodf[j].dwOfs; - offset[i] = asked_format->rgodf[j].dwOfs; - } + dt[index].offset_out = asked_format->rgodf[j].dwOfs; + offset[i] = asked_format->rgodf[j].dwOfs; dt[index].value = 0; next = next + dt[index].size;

1 0

Stefan Dösinger : wined3d: Move wined3drs_fogdensity to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: e53c2a9c4cb0339918298e03c02a8e6672d183cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e53c2a9c4cb0339918298e03c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 16:34:45 2006 +0100 wined3d: Move wined3drs_fogdensity to the state table. --- dlls/wined3d/device.c | 9 +-------- dlls/wined3d/state.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ef7cec..18e2a29 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3380,15 +3380,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_FOGEND : case WINED3DRS_RANGEFOGENABLE : case WINED3DRS_FOGCOLOR : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_FOGDENSITY : - { - tmpvalue.d = Value; - glFogfv(GL_FOG_DENSITY, &tmpvalue.f); - checkGLcall("glFogf(GL_FOG_DENSITY, (float) Value)"); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_VERTEXBLEND : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 36c6311..b439795 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -800,6 +800,16 @@ static void state_fogcolor(DWORD state, checkGLcall("glFog GL_FOG_COLOR"); } +static void state_fogdensity(DWORD state, IWineD3DStateBlockImpl *stateblock) { + union { + DWORD d; + float f; + } tmpvalue; + tmpvalue.d = stateblock->renderState[WINED3DRS_FOGDENSITY]; + glFogfv(GL_FOG_DENSITY, &tmpvalue.f); + checkGLcall("glFogf(GL_FOG_DENSITY, (float) Value)"); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -841,7 +851,7 @@ const struct StateEntry StateTable[] = { /* 35, WINED3DRS_FOGTABLEMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, { /* 36, WINED3DRS_FOGSTART */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, { /* 37, WINED3DRS_FOGEND */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, - { /* 38, WINED3DRS_FOGDENSITY */ STATE_RENDER(WINED3DRS_FOGDENSITY), state_unknown }, + { /* 38, WINED3DRS_FOGDENSITY */ STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, { /* 39, WINED3DRS_STIPPLEENABLE */ STATE_RENDER(WINED3DRS_STIPPLEENABLE), state_unknown }, { /* 40, WINED3DRS_EDGEANTIALIAS */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }, { /* 41, WINED3DRS_COLORKEYENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha },

1 0

Stefan Dösinger : wined3d: Make WINED3DRS_RANGEFOGENABLE a nogl state.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: f2602486502a97381bef303c5dd67d394d5519f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2602486502a97381bef303c5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 20:03:27 2006 +0100 wined3d: Make WINED3DRS_RANGEFOGENABLE a nogl state. --- dlls/wined3d/device.c | 11 +---------- dlls/wined3d/state.c | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7f7ad47..ac1e7a8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3378,17 +3378,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_FOGVERTEXMODE : case WINED3DRS_FOGSTART : case WINED3DRS_FOGEND : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_RANGEFOGENABLE : - { - if (Value) { - TRACE("Enabled RANGEFOG\n"); - } else { - TRACE("Disabled RANGEFOG\n"); - } - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_FOGCOLOR : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 69d82c9..026418c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -843,7 +843,7 @@ const struct StateEntry StateTable[] = { /* 45, WINED3DRS_TEXTUREADDRESSV */ 0, /* Handled in ddraw */ state_undefined }, { /* 46, WINED3DRS_MIPMAPLODBIAS */ STATE_RENDER(WINED3DRS_MIPMAPLODBIAS), state_unknown }, { /* 47, WINED3DRS_ZBIAS */ STATE_RENDER(WINED3DRS_ZBIAS), state_unknown }, - { /* 48, WINED3DRS_RANGEFOGENABLE */ STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_unknown }, + { /* 48, WINED3DRS_RANGEFOGENABLE */ 0, state_nogl }, { /* 49, WINED3DRS_ANISOTROPY */ STATE_RENDER(WINED3DRS_ANISOTROPY), state_unknown }, { /* 50, WINED3DRS_FLUSHBATCH */ STATE_RENDER(WINED3DRS_FLUSHBATCH), state_unknown }, { /* 51, WINED3DRS_TRANSLUCENTSORTINDEPENDENT */ STATE_RENDER(WINED3DRS_TRANSLUCENTSORTINDEPENDENT), state_unknown },

1 0

Stefan Dösinger : wined3d: Remove the unused stateblock vertex blend member.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: a628b99d6308a7abb4fe4fa6884951d755f7fea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a628b99d6308a7abb4fe4fa68… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 20:02:31 2006 +0100 wined3d: Remove the unused stateblock vertex blend member. --- dlls/wined3d/device.c | 8 +------- dlls/wined3d/stateblock.c | 1 - dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 18e2a29..e1fbd50 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3381,14 +3381,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_RANGEFOGENABLE : case WINED3DRS_FOGCOLOR : case WINED3DRS_FOGDENSITY : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_VERTEXBLEND : - { - This->updateStateBlock->vertex_blend = (WINED3DVERTEXBLENDFLAGS) Value; - TRACE("Vertex Blending state to %d\n", Value); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_TWEENFACTOR : diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8974501..c0db61f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -167,7 +167,6 @@ void stateblock_copy( Dest->viewport = This->viewport; Dest->material = This->material; Dest->pixelShader = This->pixelShader; - Dest->vertex_blend = This->vertex_blend; Dest->tween_factor = This->tween_factor; Dest->glsl_program = This->glsl_program; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9d453b2..cd49944 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1172,7 +1172,6 @@ struct IWineD3DStateBlockImpl float *pixelShaderConstantF; /* Indexed Vertex Blending */ - WINED3DVERTEXBLENDFLAGS vertex_blend; FLOAT tween_factor; /* RenderState */

1 0

Stefan Dösinger : wined3d: Move WINED3DRS_FOGCOLOR to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: af935a24022df11e39d09b8513e6d01146e213fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=af935a24022df11e39d09b851… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 18:52:30 2006 +0100 wined3d: Move WINED3DRS_FOGCOLOR to the state table. --- dlls/wined3d/device.c | 11 +---------- dlls/wined3d/state.c | 10 +++++++++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ac1e7a8..1ef7cec 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3379,17 +3379,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_FOGSTART : case WINED3DRS_FOGEND : case WINED3DRS_RANGEFOGENABLE : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_FOGCOLOR : - { - float col[4]; - D3DCOLORTOGLFLOAT4(Value, col); - /* Set the default alpha blend color */ - glFogfv(GL_FOG_COLOR, &col[0]); - checkGLcall("glFog GL_FOG_COLOR"); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_FOGDENSITY : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 026418c..36c6311 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -792,6 +792,14 @@ static void state_fog(DWORD state, IWine } } +static void state_fogcolor(DWORD state, IWineD3DStateBlockImpl *stateblock) { + float col[4]; + D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_FOGCOLOR], col); + /* Set the default alpha blend color */ + glFogfv(GL_FOG_COLOR, &col[0]); + checkGLcall("glFog GL_FOG_COLOR"); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -829,7 +837,7 @@ const struct StateEntry StateTable[] = { /* 31, WINED3DRS_SUBPIXEL */ STATE_RENDER(WINED3DRS_SUBPIXEL), state_unknown }, { /* 32, WINED3DRS_SUBPIXELX */ STATE_RENDER(WINED3DRS_SUBPIXELX), state_unknown }, { /* 33, WINED3DRS_STIPPLEDALPHA */ STATE_RENDER(WINED3DRS_STIPPLEDALPHA), state_unknown }, - { /* 34, WINED3DRS_FOGCOLOR */ STATE_RENDER(WINED3DRS_FOGCOLOR), state_unknown }, + { /* 34, WINED3DRS_FOGCOLOR */ STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, { /* 35, WINED3DRS_FOGTABLEMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, { /* 36, WINED3DRS_FOGSTART */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, { /* 37, WINED3DRS_FOGEND */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog },

1 0

Stefan Dösinger : wined3d: Move fog states to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 6175273c28a70713ac8ff2a39454ca47ace0a0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6175273c28a70713ac8ff2a39… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 18:42:43 2006 +0100 wined3d: Move fog states to the state table. --- dlls/wined3d/device.c | 153 ++------------------------------------------ dlls/wined3d/state.c | 170 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 170 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6175273c28a70713ac8ff…

1 0

Stefan Dösinger : wined3d: Move WINED3DRS_STENCILWRITEMASK to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 8d7243192a7f566f64a52cde9f64b29fa91aee89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d7243192a7f566f64a52cde9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 18:41:05 2006 +0100 wined3d: Move WINED3DRS_STENCILWRITEMASK to the state table. --- dlls/wined3d/device.c | 9 +-------- dlls/wined3d/state.c | 7 ++++++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 995316f..2d39baf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3372,15 +3372,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_CCW_STENCILZFAIL : case WINED3DRS_CCW_STENCILPASS : case WINED3DRS_EDGEANTIALIAS : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_STENCILWRITEMASK : - { - glStencilMask(Value); - TRACE("glStencilMask(%u)\n", Value); - checkGLcall("glStencilMask"); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_FOGENABLE : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2e1bf60..535c93f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -627,6 +627,11 @@ state_stencil(DWORD state, IWineD3DState } } +static void state_stencilwrite(DWORD state, IWineD3DStateBlockImpl *stateblock) { + glStencilMask(stateblock->renderState[WINED3DRS_STENCILWRITEMASK]); + checkGLcall("glStencilMask"); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -689,7 +694,7 @@ const struct StateEntry StateTable[] = { /* 56, WINED3DRS_STENCILFUNC */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, { /* 57, WINED3DRS_STENCILREF */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, { /* 58, WINED3DRS_STENCILMASK */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, - { /* 59, WINED3DRS_STENCILWRITEMASK */ STATE_RENDER(WINED3DRS_STENCILWRITEMASK), state_unknown }, + { /* 59, WINED3DRS_STENCILWRITEMASK */ STATE_RENDER(WINED3DRS_STENCILWRITEMASK), state_stencilwrite }, { /* 60, WINED3DRS_TEXTUREFACTOR */ STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor }, /* A BIG hole. If wanted, 'fixed' states like the vertex type or the bound shaders can be put here */ { /* 61, Undefined */ 0, state_undefined },

1 0

Stefan Dösinger : wined3d: Move stencil states to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 0d9ae20883250b4d9604524b29df35f1d59c3896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d9ae20883250b4d9604524b2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 18:39:45 2006 +0100 wined3d: Move stencil states to the state table. --- dlls/wined3d/device.c | 109 +------------------------------------------- dlls/wined3d/state.c | 121 ++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 111 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d9ae20883250b4d96045…

1 0

Stefan Dösinger : wined3d: Move WINED3DRS_SPECULARENABLE to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 0772bb49e45a0e4d20b722006ab447ff9dd0fdaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0772bb49e45a0e4d20b722006… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 18:38:30 2006 +0100 wined3d: Move WINED3DRS_SPECULARENABLE to the state table. --- dlls/wined3d/device.c | 70 +---------------------------------------------- dlls/wined3d/state.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 70 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d0bdde9..753441c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3461,76 +3461,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_CLIPPING : case WINED3DRS_BLENDOP : case WINED3DRS_TEXTUREFACTOR : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_SPECULARENABLE : - { - /* Originally this used glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL,GL_SEPARATE_SPECULAR_COLOR) - and (GL_LIGHT_MODEL_COLOR_CONTROL,GL_SINGLE_COLOR) to swap between enabled/disabled - specular color. This is wrong: - Separate specular color means the specular colour is maintained separately, whereas - single color means it is merged in. However in both cases they are being used to - some extent. - To disable specular color, set it explicitly to black and turn off GL_COLOR_SUM_EXT - NOTE: If not supported don't give FIXMEs the impact is really minimal and very few people are - running 1.4 yet! - */ - /* - * If register combiners are enabled, enabling / disabling GL_COLOR_SUM has no effect. - * Instead, we need to setup the FinalCombiner properly. - * - * The default setup for the FinalCombiner is: - * - * <variable> <input> <mapping> <usage> - * GL_VARIABLE_A_NV GL_FOG, GL_UNSIGNED_IDENTITY_NV GL_ALPHA - * GL_VARIABLE_B_NV GL_SPARE0_PLUS_SECONDARY_COLOR_NV GL_UNSIGNED_IDENTITY_NV GL_RGB - * GL_VARIABLE_C_NV GL_FOG GL_UNSIGNED_IDENTITY_NV GL_RGB - * GL_VARIABLE_D_NV GL_ZERO GL_UNSIGNED_IDENTITY_NV GL_RGB - * GL_VARIABLE_E_NV GL_ZERO GL_UNSIGNED_IDENTITY_NV GL_RGB - * GL_VARIABLE_F_NV GL_ZERO GL_UNSIGNED_IDENTITY_NV GL_RGB - * GL_VARIABLE_G_NV GL_SPARE0_NV GL_UNSIGNED_IDENTITY_NV GL_ALPHA - * - * That's pretty much fine as it is, except for variable B, which needs to take - * either GL_SPARE0_PLUS_SECONDARY_COLOR_NV or GL_SPARE0_NV, depending on - * whether WINED3DRS_SPECULARENABLE is enabled or not. - */ - - if (Value) { - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*) &This->updateStateBlock->material.Specular); - checkGLcall("glMaterialfv"); - if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { - glEnable(GL_COLOR_SUM_EXT); - } else { - TRACE("Specular colors cannot be enabled in this version of opengl\n"); - } - checkGLcall("glEnable(GL_COLOR_SUM)"); - - if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { - GL_EXTCALL(glFinalCombinerInputNV(GL_VARIABLE_B_NV, GL_SPARE0_PLUS_SECONDARY_COLOR_NV, GL_UNSIGNED_IDENTITY_NV, GL_RGB)); - checkGLcall("glFinalCombinerInputNV()"); - } - } else { - float black[4] = {0.0f, 0.0f, 0.0f, 0.0f}; - - /* for the case of enabled lighting: */ - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &black[0]); - checkGLcall("glMaterialfv"); - - /* for the case of disabled lighting: */ - if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { - glDisable(GL_COLOR_SUM_EXT); - } else { - TRACE("Specular colors cannot be disabled in this version of opengl\n"); - } - checkGLcall("glDisable(GL_COLOR_SUM)"); - - if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { - GL_EXTCALL(glFinalCombinerInputNV(GL_VARIABLE_B_NV, GL_SPARE0_NV, GL_UNSIGNED_IDENTITY_NV, GL_RGB)); - checkGLcall("glFinalCombinerInputNV()"); - } - } - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_STENCILENABLE : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 549b120..a492fbe 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -432,6 +432,76 @@ static void state_blendop(DWORD state, I checkGLcall("glBlendEquation"); } +static void +state_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock) { + /* Originally this used glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL,GL_SEPARATE_SPECULAR_COLOR) + * and (GL_LIGHT_MODEL_COLOR_CONTROL,GL_SINGLE_COLOR) to swap between enabled/disabled + * specular color. This is wrong: + * Separate specular color means the specular colour is maintained separately, whereas + * single color means it is merged in. However in both cases they are being used to + * some extent. + * To disable specular color, set it explicitly to black and turn off GL_COLOR_SUM_EXT + * NOTE: If not supported don't give FIXMEs the impact is really minimal and very few people are + * running 1.4 yet! + * + * + * If register combiners are enabled, enabling / disabling GL_COLOR_SUM has no effect. + * Instead, we need to setup the FinalCombiner properly. + * + * The default setup for the FinalCombiner is: + * + * <variable> <input> <mapping> <usage> + * GL_VARIABLE_A_NV GL_FOG, GL_UNSIGNED_IDENTITY_NV GL_ALPHA + * GL_VARIABLE_B_NV GL_SPARE0_PLUS_SECONDARY_COLOR_NV GL_UNSIGNED_IDENTITY_NV GL_RGB + * GL_VARIABLE_C_NV GL_FOG GL_UNSIGNED_IDENTITY_NV GL_RGB + * GL_VARIABLE_D_NV GL_ZERO GL_UNSIGNED_IDENTITY_NV GL_RGB + * GL_VARIABLE_E_NV GL_ZERO GL_UNSIGNED_IDENTITY_NV GL_RGB + * GL_VARIABLE_F_NV GL_ZERO GL_UNSIGNED_IDENTITY_NV GL_RGB + * GL_VARIABLE_G_NV GL_SPARE0_NV GL_UNSIGNED_IDENTITY_NV GL_ALPHA + * + * That's pretty much fine as it is, except for variable B, which needs to take + * either GL_SPARE0_PLUS_SECONDARY_COLOR_NV or GL_SPARE0_NV, depending on + * whether WINED3DRS_SPECULARENABLE is enabled or not. + */ + + TRACE("Setting specular enable state\n"); + /* TODO: Add to the material setting functions */ + if (stateblock->renderState[WINED3DRS_SPECULARENABLE]) { + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*) &stateblock->material.Specular); + checkGLcall("glMaterialfv"); + if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { + glEnable(GL_COLOR_SUM_EXT); + } else { + TRACE("Specular colors cannot be enabled in this version of opengl\n"); + } + checkGLcall("glEnable(GL_COLOR_SUM)"); + + if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { + GL_EXTCALL(glFinalCombinerInputNV(GL_VARIABLE_B_NV, GL_SPARE0_PLUS_SECONDARY_COLOR_NV, GL_UNSIGNED_IDENTITY_NV, GL_RGB)); + checkGLcall("glFinalCombinerInputNV()"); + } + } else { + float black[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + + /* for the case of enabled lighting: */ + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &black[0]); + checkGLcall("glMaterialfv"); + + /* for the case of disabled lighting: */ + if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { + glDisable(GL_COLOR_SUM_EXT); + } else { + TRACE("Specular colors cannot be disabled in this version of opengl\n"); + } + checkGLcall("glDisable(GL_COLOR_SUM)"); + + if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { + GL_EXTCALL(glFinalCombinerInputNV(GL_VARIABLE_B_NV, GL_SPARE0_NV, GL_UNSIGNED_IDENTITY_NV, GL_RGB)); + checkGLcall("glFinalCombinerInputNV()"); + } + } +} + static void state_texfactor(DWORD state, IWineD3DStateBlockImpl *stateblock) { unsigned int i; @@ -492,7 +562,7 @@ const struct StateEntry StateTable[] = { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable }, { /* 27, WINED3DRS_ALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }, { /* 28, WINED3DRS_FOGENABLE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_unknown }, - { /* 29, WINED3DRS_SPECULARENABLE */ STATE_RENDER(WINED3DRS_SPECULARENABLE), state_unknown }, + { /* 29, WINED3DRS_SPECULARENABLE */ STATE_RENDER(WINED3DRS_SPECULARENABLE), state_specularenable}, { /* 30, WINED3DRS_ZVISIBLE */ 0 /* Not supported according to the msdn */, state_nogl }, { /* 31, WINED3DRS_SUBPIXEL */ STATE_RENDER(WINED3DRS_SUBPIXEL), state_unknown }, { /* 32, WINED3DRS_SUBPIXELX */ STATE_RENDER(WINED3DRS_SUBPIXELX), state_unknown },

1 0