December 2006 - Wine-Commits

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

Dec. 11, 2006

Module: wine Branch: master Commit: cd0d0a7041d0b359147280dda8f566e12c2734fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0d0a7041d0b359147280dda… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:21:27 2006 +0100 wined3d: Move tesselation to the state table. --- dlls/wined3d/device.c | 28 +++++++--------------------- dlls/wined3d/state.c | 20 +++++++++++++------- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3593036..baec6aa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3430,6 +3430,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_DEBUGMONITORTOKEN : case WINED3DRS_POSITIONDEGREE : case WINED3DRS_NORMALDEGREE : + case WINED3DRS_MINTESSELLATIONLEVEL : + case WINED3DRS_MAXTESSELLATIONLEVEL : + case WINED3DRS_ADAPTIVETESS_X : + case WINED3DRS_ADAPTIVETESS_Y : + case WINED3DRS_ADAPTIVETESS_Z : + case WINED3DRS_ADAPTIVETESS_W : + case WINED3DRS_ENABLEADAPTIVETESSELLATION: StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3440,27 +3447,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_MINTESSELLATIONLEVEL : - case WINED3DRS_MAXTESSELLATIONLEVEL : - case WINED3DRS_ADAPTIVETESS_X : - case WINED3DRS_ADAPTIVETESS_Y : - case WINED3DRS_ADAPTIVETESS_Z : - case WINED3DRS_ADAPTIVETESS_W : - { - if(This->stateBlock->renderState[WINED3DRS_ENABLEADAPTIVETESSELLATION]) - FIXME("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value); - else - TRACE("(%p)->(%s,%d): recording state but WINED3DRS_ENABLEADAPTIVETESSELLATION is not enabled\n", This, debug_d3drenderstate(State), Value); - break; - } - - case WINED3DRS_ENABLEADAPTIVETESSELLATION: - { - if(Value) - ERR("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value); - break; - } - case WINED3DRS_SRGBWRITEENABLE : { if(Value) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 08357d8..ff016ce 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1202,6 +1202,12 @@ static void state_normaldegree(DWORD sta ERR("(WINED3DRS_NORMALDEGREE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_NORMALDEGREE]); } +static void state_tessellation(DWORD state, IWineD3DStateBlockImpl *stateblock) { + TRACE("Stub\n"); + if(stateblock->renderState[WINED3DRS_ENABLEADAPTIVETESSELLATION]) + FIXME("(WINED3DRS_ENABLEADAPTIVETESSELLATION,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_ENABLEADAPTIVETESSELLATION]); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1387,13 +1393,13 @@ const struct StateEntry StateTable[] = { /*175, WINED3DRS_SLOPESCALEDEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, { /*176, WINED3DRS_ANTIALIASEDLINEENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }, { /*177, undefined */ 0, state_undefined }, - { /*178, WINED3DRS_MINTESSELLATIONLEVEL */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_unknown }, - { /*179, WINED3DRS_MAXTESSELLATIONLEVEL */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_unknown }, - { /*180, WINED3DRS_ADAPTIVETESS_X */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_unknown }, - { /*181, WINED3DRS_ADAPTIVETESS_Y */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_unknown }, - { /*182, WINED3DRS_ADAPTIVETESS_Z */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_unknown }, - { /*183, WINED3DRS_ADAPTIVETESS_W */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_unknown }, - { /*184, WINED3DRS_ENABLEADAPTIVETESSELLATION */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_unknown }, + { /*178, WINED3DRS_MINTESSELLATIONLEVEL */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, + { /*179, WINED3DRS_MAXTESSELLATIONLEVEL */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, + { /*180, WINED3DRS_ADAPTIVETESS_X */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, + { /*181, WINED3DRS_ADAPTIVETESS_Y */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, + { /*182, WINED3DRS_ADAPTIVETESS_Z */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, + { /*183, WINED3DRS_ADAPTIVETESS_W */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, + { /*184, WINED3DRS_ENABLEADAPTIVETESSELLATION */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, { /*185, WINED3DRS_TWOSIDEDSTENCILMODE */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, { /*186, WINED3DRS_CCW_STENCILFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, { /*187, WINED3DRS_CCW_STENCILZFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil },

1 0

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

Dec. 11, 2006

Module: wine Branch: master Commit: 3bb41771adf93c74ae0100ea04824baf78d6bc58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb41771adf93c74ae0100ea0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:21:25 2006 +0100 wined3d: Move WINED3DRS_NORMALDEGREE to the state table. --- dlls/wined3d/device.c | 8 +------- dlls/wined3d/state.c | 8 +++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0103bf0..3593036 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3429,6 +3429,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_PATCHSEGMENTS : case WINED3DRS_DEBUGMONITORTOKEN : case WINED3DRS_POSITIONDEGREE : + case WINED3DRS_NORMALDEGREE : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3439,13 +3440,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_NORMALDEGREE : - { - if(WINED3DDEGREE_LINEAR != Value) - ERR("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value); - break; - } - case WINED3DRS_MINTESSELLATIONLEVEL : case WINED3DRS_MAXTESSELLATIONLEVEL : case WINED3DRS_ADAPTIVETESS_X : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index caf55f9..08357d8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1196,6 +1196,12 @@ static void state_positiondegree(DWORD s ERR("(WINED3DRS_POSITIONDEGREE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_POSITIONDEGREE]); } +static void state_normaldegree(DWORD state, IWineD3DStateBlockImpl *stateblock) { + TRACE("Stub\n"); + if (stateblock->renderState[WINED3DRS_NORMALDEGREE] != D3DDEGREE_LINEAR) + ERR("(WINED3DRS_NORMALDEGREE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_NORMALDEGREE]); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1374,7 +1380,7 @@ const struct StateEntry StateTable[] = { /*170, WINED3DRS_TWEENFACTOR */ 0, state_nogl }, { /*171, WINED3DRS_BLENDOP */ STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }, { /*172, WINED3DRS_POSITIONDEGREE */ STATE_RENDER(WINED3DRS_POSITIONDEGREE), state_positiondegree}, - { /*173, WINED3DRS_NORMALDEGREE */ STATE_RENDER(WINED3DRS_NORMALDEGREE), state_unknown }, + { /*173, WINED3DRS_NORMALDEGREE */ STATE_RENDER(WINED3DRS_NORMALDEGREE), state_normaldegree }, /*172, WINED3DRS_POSITIONORDER */ /* Value assigned to 2 state names */ /*173, WINED3DRS_NORMALORDER */ /* Value assigned to 2 state names */ { /*174, WINED3DRS_SCISSORTESTENABLE */ STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_scissor },

1 0

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

Dec. 11, 2006

Module: wine Branch: master Commit: 052197acb0da8f0af007d3d5d3e4f5af452feeb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=052197acb0da8f0af007d3d5d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:21:21 2006 +0100 wined3d: Move WINED3DRS_POSITIONDEGREE to the state table. --- dlls/wined3d/device.c | 8 +------- dlls/wined3d/state.c | 8 +++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2c640d9..0103bf0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3428,6 +3428,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_PATCHEDGESTYLE : case WINED3DRS_PATCHSEGMENTS : case WINED3DRS_DEBUGMONITORTOKEN : + case WINED3DRS_POSITIONDEGREE : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3438,13 +3439,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_POSITIONDEGREE : - { - if(WINED3DDEGREE_CUBIC != Value) - ERR("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value); - break; - } - case WINED3DRS_NORMALDEGREE : { if(WINED3DDEGREE_LINEAR != Value) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 23f5f84..caf55f9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1190,6 +1190,12 @@ static void state_patchsegments(DWORD st ERR("(WINED3DRS_PATCHSEGMENTS,%d) not yet implemented\n", tmpvalue.d); } +static void state_positiondegree(DWORD state, IWineD3DStateBlockImpl *stateblock) { + TRACE("Stub\n"); + if (stateblock->renderState[WINED3DRS_POSITIONDEGREE] != D3DDEGREE_CUBIC) + ERR("(WINED3DRS_POSITIONDEGREE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_POSITIONDEGREE]); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1367,7 +1373,7 @@ const struct StateEntry StateTable[] = { /*169, Undefined */ 0, state_undefined }, { /*170, WINED3DRS_TWEENFACTOR */ 0, state_nogl }, { /*171, WINED3DRS_BLENDOP */ STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }, - { /*172, WINED3DRS_POSITIONDEGREE */ STATE_RENDER(WINED3DRS_POSITIONDEGREE), state_unknown }, + { /*172, WINED3DRS_POSITIONDEGREE */ STATE_RENDER(WINED3DRS_POSITIONDEGREE), state_positiondegree}, { /*173, WINED3DRS_NORMALDEGREE */ STATE_RENDER(WINED3DRS_NORMALDEGREE), state_unknown }, /*172, WINED3DRS_POSITIONORDER */ /* Value assigned to 2 state names */ /*173, WINED3DRS_NORMALORDER */ /* Value assigned to 2 state names */

1 0

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

Dec. 11, 2006

Module: wine Branch: master Commit: e25edbfc6681a50ecbf90407ffe31527f3ede3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25edbfc6681a50ecbf90407f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:21:17 2006 +0100 wined3d: Make WINED3DRS_DEBUGMONITORTOKEN a nogl state. --- dlls/wined3d/device.c | 15 +-------------- dlls/wined3d/state.c | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed9978d..2c640d9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3427,6 +3427,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_MULTISAMPLEMASK : case WINED3DRS_PATCHEDGESTYLE : case WINED3DRS_PATCHSEGMENTS : + case WINED3DRS_DEBUGMONITORTOKEN : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3437,20 +3438,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_DEBUGMONITORTOKEN : - { - /* Only useful for "debug builds". */ - if(0xbaadcafe != Value) { - /* MSDN says the default is D3DDMT_ENABLE but our tests confirm 0xbaadcafe is the default. */ - /* MSDN says anything other than D3DDMT_ENABLE or DISABLE does not change the state, - * but our tests disagree. - * We do not claim to implement a debugging lib, so do not write an ERR - */ - WARN("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value); - } - break; - } - case WINED3DRS_POSITIONDEGREE : { if(WINED3DDEGREE_CUBIC != Value) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 71ab64f..23f5f84 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1360,7 +1360,7 @@ const struct StateEntry StateTable[] = { /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }, { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_patchededge }, { /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_patchsegments }, - { /*165, WINED3DRS_DEBUGMONITORTOKEN */ STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), state_unknown }, + { /*165, WINED3DRS_DEBUGMONITORTOKEN */ STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), state_nogl }, { /*166, WINED3DRS_POINTSIZE_MAX */ STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax }, { /*167, WINED3DRS_INDEXEDVERTEXBLENDENABLE */ 0, state_nogl }, { /*168, WINED3DRS_COLORWRITEENABLE */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite },

1 0

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

Dec. 11, 2006

Module: wine Branch: master Commit: 8197470d67a4a608f4d0a9ef6de15e4e5f3a51da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8197470d67a4a608f4d0a9ef6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:21:14 2006 +0100 wined3d: Move WINED3DRS_PATCHSEGMENTS to the state table. --- dlls/wined3d/device.c | 16 +--------------- dlls/wined3d/state.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a52ec26..ed9978d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3316,12 +3316,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - /* Simple way of referring to either a DWORD or a 4 byte float */ - union { - DWORD d; - float f; - } tmpvalue; - TRACE("(%p)->state = %s(%d), value = %d\n", This, debug_d3drenderstate(State), State, Value); This->updateStateBlock->changed.renderState[State] = TRUE; This->updateStateBlock->set.renderState[State] = TRUE; @@ -3432,6 +3426,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_ANTIALIAS : case WINED3DRS_MULTISAMPLEMASK : case WINED3DRS_PATCHEDGESTYLE : + case WINED3DRS_PATCHSEGMENTS : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3442,15 +3437,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_PATCHSEGMENTS : - { - /* available in d3d8 but in d3d9 it was replaced by IDirect3DDevice9::SetNPatchMode */ - tmpvalue.f = 1.0f; - if(tmpvalue.d != Value) - ERR("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value); - break; - } - case WINED3DRS_DEBUGMONITORTOKEN : { /* Only useful for "debug builds". */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1b1ecf9..71ab64f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1178,6 +1178,18 @@ static void state_patchededge(DWORD stat ERR("(WINED3DRS_PATCHEDGESTYLE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_PATCHEDGESTYLE]); } +static void state_patchsegments(DWORD state, IWineD3DStateBlockImpl *stateblock) { + union { + DWORD d; + float f; + } tmpvalue; + tmpvalue.f = 1.0f; + + TRACE("Stub\n"); + if (stateblock->renderState[WINED3DRS_PATCHSEGMENTS] != tmpvalue.d) + ERR("(WINED3DRS_PATCHSEGMENTS,%d) not yet implemented\n", tmpvalue.d); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1347,7 +1359,7 @@ const struct StateEntry StateTable[] = { /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa }, { /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }, { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_patchededge }, - { /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_unknown }, + { /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_patchsegments }, { /*165, WINED3DRS_DEBUGMONITORTOKEN */ STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), state_unknown }, { /*166, WINED3DRS_POINTSIZE_MAX */ STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax }, { /*167, WINED3DRS_INDEXEDVERTEXBLENDENABLE */ 0, state_nogl },

1 0

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

Dec. 11, 2006

Module: wine Branch: master Commit: d7b8549963e46e9b64b3ccacc610c60690319cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b8549963e46e9b64b3ccacc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:21:07 2006 +0100 wined3d: Move WINED3DRS_MULTISAMPLEMASK to the state table. --- dlls/wined3d/device.c | 8 +------- dlls/wined3d/state.c | 8 +++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3c5b2b5..c25c8f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3430,6 +3430,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_TEXTUREPERSPECTIVE : case WINED3DRS_STIPPLEDALPHA : case WINED3DRS_ANTIALIAS : + case WINED3DRS_MULTISAMPLEMASK : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3440,13 +3441,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_MULTISAMPLEMASK : - { - if(0xFFFFFFFF != Value) - ERR("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value); - break; - } - case WINED3DRS_PATCHEDGESTYLE : { if(WINED3DPATCHEDGE_DISCRETE != Value) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c5fa7f3..22dbfdd 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1166,6 +1166,12 @@ static void state_antialias(DWORD state, ERR(" Antialias not supported yet.\n"); } +static void state_multisampmask(DWORD state, IWineD3DStateBlockImpl *stateblock) { + TRACE("Stub\n"); + if (stateblock->renderState[WINED3DRS_MULTISAMPLEMASK] != 0xFFFFFFFF) + ERR("(WINED3DRS_MULTISAMPLEMASK,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_MULTISAMPLEMASK]); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1333,7 +1339,7 @@ const struct StateEntry StateTable[] = { /*159, WINED3DRS_POINTSCALE_B */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*160, WINED3DRS_POINTSCALE_C */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa }, - { /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_unknown }, + { /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }, { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_unknown }, { /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_unknown }, { /*165, WINED3DRS_DEBUGMONITORTOKEN */ STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), state_unknown },

1 0

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

Dec. 11, 2006

Module: wine Branch: master Commit: 55a5b4ca1e4ed61ddbe390a8102a253efb44f712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55a5b4ca1e4ed61ddbe390a81… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:21:03 2006 +0100 wined3d: Move WINED3DRS_ANTIALIAS to the state table. --- dlls/wined3d/device.c | 8 +------- dlls/wined3d/state.c | 8 +++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6012f8..3c5b2b5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3429,6 +3429,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_DEPTHBIAS : case WINED3DRS_TEXTUREPERSPECTIVE : case WINED3DRS_STIPPLEDALPHA : + case WINED3DRS_ANTIALIAS : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3439,13 +3440,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_ANTIALIAS : - { - if (Value) - ERR(" Antialias not supported yet.\n"); - break; - } - case WINED3DRS_MULTISAMPLEMASK : { if(0xFFFFFFFF != Value) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f55fd8c..c5fa7f3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1160,12 +1160,18 @@ static void state_stippledalpha(DWORD st ERR(" Stippled Alpha not supported yet.\n"); } +static void state_antialias(DWORD state, IWineD3DStateBlockImpl *stateblock) { + TRACE("Stub\n"); + if (stateblock->renderState[WINED3DRS_ANTIALIAS]) + ERR(" Antialias not supported yet.\n"); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ { /* 0, Undefined */ 0, state_undefined }, { /* 1, WINED3DRS_TEXTUREHANDLE */ 0 /* Handled in ddraw */, state_undefined }, - { /* 2, WINED3DRS_ANTIALIAS */ STATE_RENDER(WINED3DRS_ANTIALIAS), state_unknown }, + { /* 2, WINED3DRS_ANTIALIAS */ STATE_RENDER(WINED3DRS_ANTIALIAS), state_antialias }, { /* 3, WINED3DRS_TEXTUREADDRESS */ 0 /* Handled in ddraw */, state_undefined }, { /* 4, WINED3DRS_TEXTUREPERSPECTIVE */ STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), state_perspective }, { /* 5, WINED3DRS_WRAPU */ STATE_RENDER(WINED3DRS_WRAPU), state_unknown },

1 0

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

Dec. 11, 2006

Module: wine Branch: master Commit: e498a16124812c88acde06bc209b821c777e3f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e498a16124812c88acde06bc2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:21:10 2006 +0100 wined3d: Move WINED3DRS_PATCHEDGESTYLE to the state table. --- dlls/wined3d/device.c | 8 +------- dlls/wined3d/state.c | 8 +++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c25c8f8..a52ec26 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3431,6 +3431,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_STIPPLEDALPHA : case WINED3DRS_ANTIALIAS : case WINED3DRS_MULTISAMPLEMASK : + case WINED3DRS_PATCHEDGESTYLE : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3441,13 +3442,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_PATCHEDGESTYLE : - { - if(WINED3DPATCHEDGE_DISCRETE != Value) - ERR("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value); - break; - } - case WINED3DRS_PATCHSEGMENTS : { /* available in d3d8 but in d3d9 it was replaced by IDirect3DDevice9::SetNPatchMode */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 22dbfdd..1b1ecf9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1172,6 +1172,12 @@ static void state_multisampmask(DWORD st ERR("(WINED3DRS_MULTISAMPLEMASK,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_MULTISAMPLEMASK]); } +static void state_patchededge(DWORD state, IWineD3DStateBlockImpl *stateblock) { + TRACE("Stub\n"); + if (stateblock->renderState[WINED3DRS_PATCHEDGESTYLE] != D3DPATCHEDGE_DISCRETE) + ERR("(WINED3DRS_PATCHEDGESTYLE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_PATCHEDGESTYLE]); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1340,7 +1346,7 @@ const struct StateEntry StateTable[] = { /*160, WINED3DRS_POINTSCALE_C */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa }, { /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }, - { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_unknown }, + { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_patchededge }, { /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_unknown }, { /*165, WINED3DRS_DEBUGMONITORTOKEN */ STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), state_unknown }, { /*166, WINED3DRS_POINTSIZE_MAX */ STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax },

1 0

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

Dec. 11, 2006

Module: wine Branch: master Commit: 2710be0327ea1c46712269a4d54868b708b3e693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2710be0327ea1c46712269a4d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:59 2006 +0100 wined3d: Move WINED3DRS_STIPPLEDALPHA to the state table. --- dlls/wined3d/device.c | 7 +------ dlls/wined3d/state.c | 8 +++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9ad6418..e6012f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3428,6 +3428,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_SLOPESCALEDEPTHBIAS : case WINED3DRS_DEPTHBIAS : case WINED3DRS_TEXTUREPERSPECTIVE : + case WINED3DRS_STIPPLEDALPHA : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3438,12 +3439,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_STIPPLEDALPHA : - { - if (Value) - ERR(" Stippled Alpha not supported yet.\n"); - break; - } case WINED3DRS_ANTIALIAS : { if (Value) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a34cc69..f55fd8c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1154,6 +1154,12 @@ static void state_perspective(DWORD stat } } +static void state_stippledalpha(DWORD state, IWineD3DStateBlockImpl *stateblock) { + TRACE("Stub\n"); + if (stateblock->renderState[WINED3DRS_STIPPLEDALPHA]) + ERR(" Stippled Alpha not supported yet.\n"); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1190,7 +1196,7 @@ const struct StateEntry StateTable[] = { /* 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 }, - { /* 33, WINED3DRS_STIPPLEDALPHA */ STATE_RENDER(WINED3DRS_STIPPLEDALPHA), state_unknown }, + { /* 33, WINED3DRS_STIPPLEDALPHA */ STATE_RENDER(WINED3DRS_STIPPLEDALPHA), state_stippledalpha }, { /* 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 },

1 0

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

Dec. 11, 2006

Module: wine Branch: master Commit: 312be4641511992e02e157dbab039abc623d2afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=312be4641511992e02e157dba… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:56 2006 +0100 wined3d: Move WINED3DRS_TEXTUREPERSPECTIVE to the state table. --- dlls/wined3d/device.c | 10 +--------- dlls/wined3d/state.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 42fe537..9ad6418 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3427,6 +3427,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_SCISSORTESTENABLE : case WINED3DRS_SLOPESCALEDEPTHBIAS : case WINED3DRS_DEPTHBIAS : + case WINED3DRS_TEXTUREPERSPECTIVE : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3437,15 +3438,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_TEXTUREPERSPECTIVE : - { - if (Value) - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); - else - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); - break; - } - case WINED3DRS_STIPPLEDALPHA : { if (Value) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5de3e51..a34cc69 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1144,6 +1144,16 @@ static void state_depthbias(DWORD state, } } +static void state_perspective(DWORD state, IWineD3DStateBlockImpl *stateblock) { + if (stateblock->renderState[WINED3DRS_TEXTUREPERSPECTIVE]) { + glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); + checkGLcall("glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST)"); + } else { + glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); + checkGLcall("glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST)"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1151,7 +1161,7 @@ const struct StateEntry StateTable[] = { /* 1, WINED3DRS_TEXTUREHANDLE */ 0 /* Handled in ddraw */, state_undefined }, { /* 2, WINED3DRS_ANTIALIAS */ STATE_RENDER(WINED3DRS_ANTIALIAS), state_unknown }, { /* 3, WINED3DRS_TEXTUREADDRESS */ 0 /* Handled in ddraw */, state_undefined }, - { /* 4, WINED3DRS_TEXTUREPERSPECTIVE */ STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), state_unknown }, + { /* 4, WINED3DRS_TEXTUREPERSPECTIVE */ STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), state_perspective }, { /* 5, WINED3DRS_WRAPU */ STATE_RENDER(WINED3DRS_WRAPU), state_unknown }, { /* 6, WINED3DRS_WRAPV */ STATE_RENDER(WINED3DRS_WRAPV), state_unknown }, { /* 7, WINED3DRS_ZENABLE */ STATE_RENDER(WINED3DRS_ZENABLE), state_zenable },

1 0