December 2006 - Wine-Commits

Alexandre Julliard : shlwapi: Fixed string tests for non-English locales.
by Alexandre Julliard Dec. 8, 2006

Dec. 8, 2006

Module: wine Branch: master Commit: f662e2548b87d578bf9188f220541e45887aa1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f662e2548b87d578bf9188f22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 12:55:43 2006 +0100 shlwapi: Fixed string tests for non-English locales. --- dlls/shlwapi/tests/string.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 5bed266..6369a87 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -761,8 +761,8 @@ START_TEST(string) TCHAR decimalDelim[8]; CoInitialize(0); - GetLocaleInfo(GetUserDefaultLCID(), LOCALE_STHOUSAND, thousandDelim, 8); - GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SDECIMAL, decimalDelim, 8); + GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousandDelim, 8); + GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimalDelim, 8); hShlwapi = GetModuleHandleA("shlwapi"); if (!hShlwapi) @@ -787,11 +787,13 @@ START_TEST(string) test_StrFormatKBSizeA(); test_StrFormatKBSizeW(); } - if (0) - { - /* language-dependent test. FIXME: how to detect the language? */ + + /* language-dependent test */ + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) + trace("Skipping StrFromTimeInterval test for non English language\n"); + else test_StrFromTimeIntervalA(); - } + test_StrCmpA(); test_StrCmpW(); test_StrRetToBSTR();

1 0

Stefan Dösinger : wined3d: Move blending related states to the state table.
by Alexandre Julliard Dec. 8, 2006

Dec. 8, 2006

Module: wine Branch: master Commit: 1f07e4af18f80ac0ec208b0883669dc6bff04fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f07e4af18f80ac0ec208b088… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 01:51:11 2006 +0100 wined3d: Move blending related states to the state table. --- dlls/wined3d/device.c | 93 +++------------------------------------ dlls/wined3d/state.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 117 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f07e4af18f80ac0ec208…

1 0

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

Dec. 8, 2006

Module: wine Branch: master Commit: 28cc3c8d6b3ab9fd500f94aa3976c0b47eda8fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=28cc3c8d6b3ab9fd500f94aa3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 01:45:26 2006 +0100 wined3d: Move WINED3DRS_AMBIENT to the state table. --- dlls/wined3d/device.c | 12 +----------- dlls/wined3d/state.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b51f32d..36dd77d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3444,18 +3444,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_DITHERENABLE : case WINED3DRS_ZWRITEENABLE : case WINED3DRS_ZFUNC : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_AMBIENT : - { - float col[4]; - D3DCOLORTOGLFLOAT4(Value, col); - TRACE("Setting ambient to (%f,%f,%f,%f)\n", col[0], col[1], col[2], col[3]); - glLightModelfv(GL_LIGHT_MODEL_AMBIENT, col); - checkGLcall("glLightModel for MODEL_AMBIENT"); - - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_ALPHABLENDENABLE : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 684ff94..83e05bc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -204,6 +204,15 @@ static void state_zfunc(DWORD state, IWi } } +static void state_ambient(DWORD state, IWineD3DStateBlockImpl *stateblock) { + float col[4]; + D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_AMBIENT], col); + + TRACE("Setting ambient to (%f,%f,%f,%f)\n", col[0], col[1], col[2], col[3]); + glLightModelfv(GL_LIGHT_MODEL_AMBIENT, col); + checkGLcall("glLightModel for MODEL_AMBIENT"); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -348,7 +357,7 @@ const struct StateEntry StateTable[] = { /*136, WINED3DRS_CLIPPING */ STATE_RENDER(WINED3DRS_CLIPPING), state_unknown }, { /*137, WINED3DRS_LIGHTING */ STATE_RENDER(WINED3DRS_LIGHTING) /* Vertex decl! */,state_lighting }, { /*138, WINED3DRS_EXTENTS */ STATE_RENDER(WINED3DRS_EXTENTS), state_unknown }, - { /*139, WINED3DRS_AMBIENT */ STATE_RENDER(WINED3DRS_AMBIENT), state_unknown }, + { /*139, WINED3DRS_AMBIENT */ STATE_RENDER(WINED3DRS_AMBIENT), state_ambient }, { /*140, WINED3DRS_FOGVERTEXMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_unknown }, { /*141, WINED3DRS_COLORVERTEX */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_unknown }, { /*142, WINED3DRS_LOCALVIEWER */ STATE_RENDER(WINED3DRS_LOCALVIEWER), state_unknown },

1 0

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

Dec. 8, 2006

Module: wine Branch: master Commit: 2ac48e81541852358a7d9ec0dddd23c882f476b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac48e81541852358a7d9ec0d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 01:44:55 2006 +0100 wined3d: Move WINED3DRS_ZFUNCENABLE to the state table. --- dlls/wined3d/device.c | 12 +----------- dlls/wined3d/state.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 291f795..b51f32d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3443,18 +3443,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_SHADEMODE : case WINED3DRS_DITHERENABLE : case WINED3DRS_ZWRITEENABLE : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_ZFUNC : - { - int glParm = CompareFunc(Value); - - if(glParm) { - glDepthFunc(glParm); - checkGLcall("glDepthFunc"); - } - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_AMBIENT : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3f9aeec..684ff94 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -195,6 +195,15 @@ static void state_zwritenable(DWORD stat } } +static void state_zfunc(DWORD state, IWineD3DStateBlockImpl *stateblock) { + int glParm = CompareFunc(stateblock->renderState[WINED3DRS_ZFUNC]); + + if(glParm) { + glDepthFunc(glParm); + checkGLcall("glDepthFunc"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -221,7 +230,7 @@ const struct StateEntry StateTable[] = { /* 20, WINED3DRS_DESTBLEND */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_unknown }, { /* 21, WINED3DRS_TEXTUREMAPBLEND */ 0 /* Handled in ddraw */, state_undefined }, { /* 22, WINED3DRS_CULLMODE */ STATE_RENDER(WINED3DRS_CULLMODE), state_cullmode }, - { /* 23, WINED3DRS_ZFUNC */ STATE_RENDER(WINED3DRS_ZFUNC), state_unknown }, + { /* 23, WINED3DRS_ZFUNC */ STATE_RENDER(WINED3DRS_ZFUNC), state_zfunc }, { /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_unknown }, { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_unknown }, { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable },

1 0

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

Dec. 8, 2006

Module: wine Branch: master Commit: 8879c7d8ddf74ae6fc8ba047c9627a84ab88efeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8879c7d8ddf74ae6fc8ba047c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 01:43:25 2006 +0100 wined3d: Move WINED3DRS_ZWRITEENABLE to the state table. --- dlls/wined3d/device.c | 11 +---------- dlls/wined3d/state.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 91acffd..291f795 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3442,17 +3442,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_CULLMODE : case WINED3DRS_SHADEMODE : case WINED3DRS_DITHERENABLE : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_ZWRITEENABLE : - if (Value) { - glDepthMask(1); - checkGLcall("glDepthMask"); - } else { - glDepthMask(0); - checkGLcall("glDepthMask"); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_ZFUNC : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0d104e0..3f9aeec 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -182,6 +182,19 @@ static void state_ditherenable(DWORD sta } } +static void state_zwritenable(DWORD state, IWineD3DStateBlockImpl *stateblock) { + /* TODO: Test if in d3d z writing is enabled even if ZENABLE is off. If yes, + * this has to be merged with ZENABLE and ZFUNC + */ + if (stateblock->renderState[WINED3DRS_ZWRITEENABLE]) { + glDepthMask(1); + checkGLcall("glDepthMask(1)"); + } else { + glDepthMask(0); + checkGLcall("glDepthMask(0)"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -199,7 +212,7 @@ const struct StateEntry StateTable[] = { /* 11, WINED3DRS_MONOENABLE */ STATE_RENDER(WINED3DRS_MONOENABLE), state_unknown }, { /* 12, WINED3DRS_ROP2 */ STATE_RENDER(WINED3DRS_ROP2), state_unknown }, { /* 13, WINED3DRS_PLANEMASK */ STATE_RENDER(WINED3DRS_PLANEMASK), state_unknown }, - { /* 14, WINED3DRS_ZWRITEENABLE */ STATE_RENDER(WINED3DRS_ZWRITEENABLE), state_unknown }, + { /* 14, WINED3DRS_ZWRITEENABLE */ STATE_RENDER(WINED3DRS_ZWRITEENABLE), state_zwritenable }, { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_unknown }, { /* 16, WINED3DRS_LASTPIXEL */ STATE_RENDER(WINED3DRS_LASTPIXEL), state_unknown }, { /* 17, WINED3DRS_TEXTUREMAG */ 0 /* Handled in ddraw */, state_undefined },

1 0

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

Dec. 8, 2006

Module: wine Branch: master Commit: bb622e81bd8de7bc73a807693a05b74d604bbe42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb622e81bd8de7bc73a807693… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 01:42:43 2006 +0100 wined3d: Move WINED3DRS_DITHERENABLE to the state table. --- dlls/wined3d/device.c | 12 +----------- dlls/wined3d/state.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8a073be..91acffd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3441,18 +3441,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_ZENABLE : case WINED3DRS_CULLMODE : case WINED3DRS_SHADEMODE : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - - case WINED3DRS_DITHERENABLE : - if (Value) { - glEnable(GL_DITHER); - checkGLcall("glEnable GL_DITHER"); - } else { - glDisable(GL_DITHER); - checkGLcall("glDisable GL_DITHER"); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_ZWRITEENABLE : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5f6397f..0d104e0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -172,6 +172,16 @@ static void state_shademode(DWORD state, } } +static void state_ditherenable(DWORD state, IWineD3DStateBlockImpl *stateblock) { + if (stateblock->renderState[WINED3DRS_DITHERENABLE]) { + glEnable(GL_DITHER); + checkGLcall("glEnable GL_DITHER"); + } else { + glDisable(GL_DITHER); + checkGLcall("glDisable GL_DITHER"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -201,7 +211,7 @@ const struct StateEntry StateTable[] = { /* 23, WINED3DRS_ZFUNC */ STATE_RENDER(WINED3DRS_ZFUNC), state_unknown }, { /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_unknown }, { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_unknown }, - { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), state_unknown }, + { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable }, { /* 27, WINED3DRS_ALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_unknown }, { /* 28, WINED3DRS_FOGENABLE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_unknown }, { /* 29, WINED3DRS_SPECULARENABLE */ STATE_RENDER(WINED3DRS_SPECULARENABLE), state_unknown },

1 0

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

Dec. 8, 2006

Module: wine Branch: master Commit: 68f1082284797a83e735cb1c2db5a3d8ca6729cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f1082284797a83e735cb1c2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 01:42:16 2006 +0100 wined3d: Move WINED3DRS_SHADEMODE to the state table. --- dlls/wined3d/device.c | 18 +----------------- dlls/wined3d/state.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9c58a7b..8a073be 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3440,26 +3440,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_LIGHTING : case WINED3DRS_ZENABLE : case WINED3DRS_CULLMODE : + case WINED3DRS_SHADEMODE : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; - case WINED3DRS_SHADEMODE : - switch ((WINED3DSHADEMODE) Value) { - case WINED3DSHADE_FLAT: - glShadeModel(GL_FLAT); - checkGLcall("glShadeModel"); - break; - case WINED3DSHADE_GOURAUD: - glShadeModel(GL_SMOOTH); - checkGLcall("glShadeModel"); - break; - case WINED3DSHADE_PHONG: - FIXME("WINED3DSHADE_PHONG isn't supported\n"); - break; - default: - FIXME("Unrecognized/Unhandled WINED3DSHADEMODE value %d\n", Value); - } - break; case WINED3DRS_DITHERENABLE : if (Value) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 59f1cba..5f6397f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -154,6 +154,24 @@ static void state_cullmode(DWORD state, } } +static void state_shademode(DWORD state, IWineD3DStateBlockImpl *stateblock) { + switch ((WINED3DSHADEMODE) stateblock->renderState[WINED3DRS_SHADEMODE]) { + case WINED3DSHADE_FLAT: + glShadeModel(GL_FLAT); + checkGLcall("glShadeModel(GL_FLAT)"); + break; + case WINED3DSHADE_GOURAUD: + glShadeModel(GL_SMOOTH); + checkGLcall("glShadeModel(GL_SMOOTH)"); + break; + case WINED3DSHADE_PHONG: + FIXME("WINED3DSHADE_PHONG isn't supported\n"); + break; + default: + FIXME("Unrecognized/Unhandled WINED3DSHADEMODE value %d\n", stateblock->renderState[WINED3DRS_SHADEMODE]); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -166,7 +184,7 @@ const struct StateEntry StateTable[] = { /* 6, WINED3DRS_WRAPV */ STATE_RENDER(WINED3DRS_WRAPV), state_unknown }, { /* 7, WINED3DRS_ZENABLE */ STATE_RENDER(WINED3DRS_ZENABLE), state_zenable }, { /* 8, WINED3DRS_FILLMODE */ STATE_RENDER(WINED3DRS_FILLMODE), state_fillmode }, - { /* 9, WINED3DRS_SHADEMODE */ STATE_RENDER(WINED3DRS_SHADEMODE), state_unknown }, + { /* 9, WINED3DRS_SHADEMODE */ STATE_RENDER(WINED3DRS_SHADEMODE), state_shademode }, { /* 10, WINED3DRS_LINEPATTERN */ STATE_RENDER(WINED3DRS_LINEPATTERN), state_unknown }, { /* 11, WINED3DRS_MONOENABLE */ STATE_RENDER(WINED3DRS_MONOENABLE), state_unknown }, { /* 12, WINED3DRS_ROP2 */ STATE_RENDER(WINED3DRS_ROP2), state_unknown },

1 0

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

Dec. 8, 2006

Module: wine Branch: master Commit: e4b4c040f08e71de2c6f6be76602110a76c4441d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4b4c040f08e71de2c6f6be76… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 01:41:43 2006 +0100 wined3d: Move WINED3DRS_CULLMODE to the state table. --- dlls/wined3d/device.c | 40 +--------------------------------------- dlls/wined3d/state.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4936fa6..9c58a7b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3439,46 +3439,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_FILLMODE : case WINED3DRS_LIGHTING : case WINED3DRS_ZENABLE : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_CULLMODE : - - /* If we are culling "back faces with clockwise vertices" then - set front faces to be counter clockwise and enable culling - of back faces */ - switch ((WINED3DCULL) Value) { - case WINED3DCULL_NONE: - glDisable(GL_CULL_FACE); - checkGLcall("glDisable GL_CULL_FACE"); - break; - case WINED3DCULL_CW: - glEnable(GL_CULL_FACE); - checkGLcall("glEnable GL_CULL_FACE"); - if (This->render_offscreen) { - glFrontFace(GL_CW); - checkGLcall("glFrontFace GL_CW"); - } else { - glFrontFace(GL_CCW); - checkGLcall("glFrontFace GL_CCW"); - } - glCullFace(GL_BACK); - break; - case WINED3DCULL_CCW: - glEnable(GL_CULL_FACE); - checkGLcall("glEnable GL_CULL_FACE"); - if (This->render_offscreen) { - glFrontFace(GL_CCW); - checkGLcall("glFrontFace GL_CCW"); - } else { - glFrontFace(GL_CW); - checkGLcall("glFrontFace GL_CW"); - } - glCullFace(GL_BACK); - break; - default: - FIXME("Unrecognized/Unhandled WINED3DCULL value %d\n", Value); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_SHADEMODE : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b47847a..59f1cba 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -114,6 +114,46 @@ static void state_zenable(DWORD state, I } } +static void state_cullmode(DWORD state, IWineD3DStateBlockImpl *stateblock) { + /* TODO: Put this into the offscreen / onscreen rendering block due to device->render_offscreen */ + + /* If we are culling "back faces with clockwise vertices" then + set front faces to be counter clockwise and enable culling + of back faces */ + switch ((WINED3DCULL) stateblock->renderState[WINED3DRS_CULLMODE]) { + case WINED3DCULL_NONE: + glDisable(GL_CULL_FACE); + checkGLcall("glDisable GL_CULL_FACE"); + break; + case WINED3DCULL_CW: + glEnable(GL_CULL_FACE); + checkGLcall("glEnable GL_CULL_FACE"); + if (stateblock->wineD3DDevice->render_offscreen) { + glFrontFace(GL_CW); + checkGLcall("glFrontFace GL_CW"); + } else { + glFrontFace(GL_CCW); + checkGLcall("glFrontFace GL_CCW"); + } + glCullFace(GL_BACK); + break; + case WINED3DCULL_CCW: + glEnable(GL_CULL_FACE); + checkGLcall("glEnable GL_CULL_FACE"); + if (stateblock->wineD3DDevice->render_offscreen) { + glFrontFace(GL_CCW); + checkGLcall("glFrontFace GL_CCW"); + } else { + glFrontFace(GL_CW); + checkGLcall("glFrontFace GL_CW"); + } + glCullFace(GL_BACK); + break; + default: + FIXME("Unrecognized/Unhandled WINED3DCULL value %d\n", stateblock->renderState[WINED3DRS_CULLMODE]); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -139,7 +179,7 @@ const struct StateEntry StateTable[] = { /* 19, WINED3DRS_SRCBLEND */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_unknown }, { /* 20, WINED3DRS_DESTBLEND */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_unknown }, { /* 21, WINED3DRS_TEXTUREMAPBLEND */ 0 /* Handled in ddraw */, state_undefined }, - { /* 22, WINED3DRS_CULLMODE */ STATE_RENDER(WINED3DRS_CULLMODE), state_unknown }, + { /* 22, WINED3DRS_CULLMODE */ STATE_RENDER(WINED3DRS_CULLMODE), state_cullmode }, { /* 23, WINED3DRS_ZFUNC */ STATE_RENDER(WINED3DRS_ZFUNC), state_unknown }, { /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_unknown }, { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_unknown },

1 0

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

Dec. 8, 2006

Module: wine Branch: master Commit: bb564dc6fa7ca6ed44ad9ca6c41050f9bfc6720d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb564dc6fa7ca6ed44ad9ca6c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 01:40:51 2006 +0100 wined3d: Move WINED3DRS_ZENABLE to the state table. --- dlls/wined3d/device.c | 21 +-------------------- dlls/wined3d/state.c | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dc1467b..4936fa6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3438,27 +3438,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl switch (State) { case WINED3DRS_FILLMODE : case WINED3DRS_LIGHTING : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_ZENABLE : - switch ((WINED3DZBUFFERTYPE) Value) { - case WINED3DZB_FALSE: - glDisable(GL_DEPTH_TEST); - checkGLcall("glDisable GL_DEPTH_TEST"); - break; - case WINED3DZB_TRUE: - glEnable(GL_DEPTH_TEST); - checkGLcall("glEnable GL_DEPTH_TEST"); - break; - case WINED3DZB_USEW: - glEnable(GL_DEPTH_TEST); - checkGLcall("glEnable GL_DEPTH_TEST"); - FIXME("W buffer is not well handled\n"); - break; - default: - FIXME("Unrecognized WINED3DZBUFFERTYPE value %d\n", Value); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_CULLMODE : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 06cb342..b47847a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -94,6 +94,26 @@ static void state_lighting(DWORD state, } } +static void state_zenable(DWORD state, IWineD3DStateBlockImpl *stateblock) { + switch ((WINED3DZBUFFERTYPE) stateblock->renderState[WINED3DRS_ZENABLE]) { + case WINED3DZB_FALSE: + glDisable(GL_DEPTH_TEST); + checkGLcall("glDisable GL_DEPTH_TEST"); + break; + case WINED3DZB_TRUE: + glEnable(GL_DEPTH_TEST); + checkGLcall("glEnable GL_DEPTH_TEST"); + break; + case WINED3DZB_USEW: + glEnable(GL_DEPTH_TEST); + checkGLcall("glEnable GL_DEPTH_TEST"); + FIXME("W buffer is not well handled\n"); + break; + default: + FIXME("Unrecognized D3DZBUFFERTYPE value %d\n", stateblock->renderState[WINED3DRS_ZENABLE]); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -104,7 +124,7 @@ const struct StateEntry StateTable[] = { /* 4, WINED3DRS_TEXTUREPERSPECTIVE */ STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), state_unknown }, { /* 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_unknown }, + { /* 7, WINED3DRS_ZENABLE */ STATE_RENDER(WINED3DRS_ZENABLE), state_zenable }, { /* 8, WINED3DRS_FILLMODE */ STATE_RENDER(WINED3DRS_FILLMODE), state_fillmode }, { /* 9, WINED3DRS_SHADEMODE */ STATE_RENDER(WINED3DRS_SHADEMODE), state_unknown }, { /* 10, WINED3DRS_LINEPATTERN */ STATE_RENDER(WINED3DRS_LINEPATTERN), state_unknown },

1 0

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

Dec. 8, 2006

Module: wine Branch: master Commit: 53e788956aa02b77b7b7c17912642c9e12ed60d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e788956aa02b77b7b7c1791… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 01:39:55 2006 +0100 wined3d: Move WINED3DRS_LIGHTNING to the state table. --- dlls/wined3d/device.c | 11 +---------- dlls/wined3d/state.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 077ac42..dc1467b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3437,17 +3437,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl switch (State) { case WINED3DRS_FILLMODE : - StateTable[STATE_RENDER(WINED3DRS_FILLMODE)].apply(STATE_RENDER(WINED3DRS_FILLMODE), This->stateBlock); - break; - case WINED3DRS_LIGHTING : - if (Value) { - glEnable(GL_LIGHTING); - checkGLcall("glEnable GL_LIGHTING"); - } else { - glDisable(GL_LIGHTING); - checkGLcall("glDisable GL_LIGHTING"); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_ZENABLE : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 32b8032..06cb342 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -79,6 +79,21 @@ static void state_fillmode(DWORD state, } } +static void state_lighting(DWORD state, IWineD3DStateBlockImpl *stateblock) { + + /* TODO: Lighting is only enabled if Vertex normals are passed by the application, + * so merge the lighting render state with the vertex declaration once it is available + */ + + if (stateblock->renderState[WINED3DRS_LIGHTING]) { + glEnable(GL_LIGHTING); + checkGLcall("glEnable GL_LIGHTING"); + } else { + glDisable(GL_LIGHTING); + checkGLcall("glDisable GL_LIGHTING"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -221,7 +236,7 @@ const struct StateEntry StateTable[] = { /*134, WINED3DRS_WRAP6 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, { /*135, WINED3DRS_WRAP7 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, { /*136, WINED3DRS_CLIPPING */ STATE_RENDER(WINED3DRS_CLIPPING), state_unknown }, - { /*137, WINED3DRS_LIGHTING */ STATE_RENDER(WINED3DRS_LIGHTING) /* Vertex decl! */,state_unknown }, + { /*137, WINED3DRS_LIGHTING */ STATE_RENDER(WINED3DRS_LIGHTING) /* Vertex decl! */,state_lighting }, { /*138, WINED3DRS_EXTENTS */ STATE_RENDER(WINED3DRS_EXTENTS), state_unknown }, { /*139, WINED3DRS_AMBIENT */ STATE_RENDER(WINED3DRS_AMBIENT), state_unknown }, { /*140, WINED3DRS_FOGVERTEXMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_unknown },

1 0