December 2006 - Wine-commits

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

11 Dec '06

Module: wine Branch: master Commit: 0ec7c8b55a9fef2a9e4089b6c4efa2b2078f1f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec7c8b55a9fef2a9e4089b6c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:09 2006 +0100 wined3d: Move WINED3DRS_POINTSIZE to the state table. --- dlls/wined3d/device.c | 9 +-------- dlls/wined3d/state.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d28ce6e..6dc22cc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3392,15 +3392,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_LINEPATTERN : case WINED3DRS_ZBIAS : /* D3D8 only */ case WINED3DRS_NORMALIZENORMALS : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_POINTSIZE : - /* FIXME: check that pointSize isn't outside glGetFloatv( GL_POINT_SIZE_MAX_ARB, &maxSize ); or -ve */ - tmpvalue.d = Value; - TRACE("Set point size to %f\n", tmpvalue.f); - glPointSize(tmpvalue.f); - checkGLcall("glPointSize(...);"); + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_POINTSIZE_MIN : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b635df0..ea03dfa 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -907,6 +907,19 @@ static void state_normalize(DWORD state, } } +static void state_psize(DWORD state, IWineD3DStateBlockImpl *stateblock) { + union { + DWORD d; + float f; + } tmpvalue; + + /* FIXME: check that pointSize isn't outside glGetFloatv( GL_POINT_SIZE_MAX_ARB, &maxSize ); or -ve */ + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE]; + TRACE("Set point size to %f\n", tmpvalue.f); + glPointSize(tmpvalue.f); + checkGLcall("glPointSize(...);"); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1066,7 +1079,7 @@ const struct StateEntry StateTable[] = { /*151, WINED3DRS_VERTEXBLEND */ 0, state_nogl }, { /*152, WINED3DRS_CLIPPLANEENABLE */ STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, { /*153, WINED3DRS_SOFTWAREVERTEXPROCESSING */ 0, state_nogl }, - { /*154, WINED3DRS_POINTSIZE */ STATE_RENDER(WINED3DRS_POINTSIZE), state_unknown }, + { /*154, WINED3DRS_POINTSIZE */ STATE_RENDER(WINED3DRS_POINTSIZE), state_psize }, { /*155, WINED3DRS_POINTSIZE_MIN */ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_unknown }, { /*156, WINED3DRS_POINTSPRITEENABLE */ STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_unknown }, { /*157, WINED3DRS_POINTSCALEENABLE */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_unknown },

1 0

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

11 Dec '06

Module: wine Branch: master Commit: 51b41d998188a372d6cc887c6010520c4f5d5876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b41d998188a372d6cc887c6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:12 2006 +0100 wined3d: Move WINED3DRS_POINTSIZE_MIN 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 6dc22cc..1d084f3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3393,17 +3393,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_ZBIAS : /* D3D8 only */ case WINED3DRS_NORMALIZENORMALS : case WINED3DRS_POINTSIZE : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_POINTSIZE_MIN : - if (GL_SUPPORT(EXT_POINT_PARAMETERS)) { - tmpvalue.d = Value; - GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, tmpvalue.f); - checkGLcall("glPointParameterfEXT(...);"); - } else { - FIXME("WINED3DRS_POINTSIZE_MIN not supported on this opengl\n"); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_POINTSIZE_MAX : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ea03dfa..94f781f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -920,6 +920,21 @@ static void state_psize(DWORD state, IWi checkGLcall("glPointSize(...);"); } +static void state_psizemin(DWORD state, IWineD3DStateBlockImpl *stateblock) { + union { + DWORD d; + float f; + } tmpvalue; + + if (GL_SUPPORT(EXT_POINT_PARAMETERS)) { + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN]; + GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, tmpvalue.f); + checkGLcall("glPointParameterfEXT(...);"); + } else { + FIXME("WINED3DRS_POINTSIZE_MIN not supported on this opengl\n"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1080,7 +1095,7 @@ const struct StateEntry StateTable[] = { /*152, WINED3DRS_CLIPPLANEENABLE */ STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, { /*153, WINED3DRS_SOFTWAREVERTEXPROCESSING */ 0, state_nogl }, { /*154, WINED3DRS_POINTSIZE */ STATE_RENDER(WINED3DRS_POINTSIZE), state_psize }, - { /*155, WINED3DRS_POINTSIZE_MIN */ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_unknown }, + { /*155, WINED3DRS_POINTSIZE_MIN */ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin }, { /*156, WINED3DRS_POINTSPRITEENABLE */ STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_unknown }, { /*157, WINED3DRS_POINTSCALEENABLE */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_unknown }, { /*158, WINED3DRS_POINTSCALE_A */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_unknown },

1 0

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

11 Dec '06

Module: wine Branch: master Commit: 9a0e4b545324605166df93d6f6e29cc8522927fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0e4b545324605166df93d6f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:15 2006 +0100 wined3d: Move WINED3DRS_POINTSIZE_MAX to the state table. --- dlls/wined3d/device.c | 15 +++------------ dlls/wined3d/state.c | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1d084f3..4e0bfe0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3394,23 +3394,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_NORMALIZENORMALS : case WINED3DRS_POINTSIZE : case WINED3DRS_POINTSIZE_MIN : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_POINTSIZE_MAX : - if (GL_SUPPORT(EXT_POINT_PARAMETERS)) { - tmpvalue.d = Value; - GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, tmpvalue.f); - checkGLcall("glPointParameterfEXT(...);"); - } else { - FIXME("WINED3DRS_POINTSIZE_MAX not supported on this opengl\n"); - } - break; - case WINED3DRS_POINTSCALE_A : case WINED3DRS_POINTSCALE_B : case WINED3DRS_POINTSCALE_C : case WINED3DRS_POINTSCALEENABLE : + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); + break; + { /* * POINTSCALEENABLE controls how point size value is treated. If set to diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 94f781f..43889ee 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -935,6 +935,21 @@ static void state_psizemin(DWORD state, } } +static void state_psizemax(DWORD state, IWineD3DStateBlockImpl *stateblock) { + union { + DWORD d; + float f; + } tmpvalue; + + if (GL_SUPPORT(EXT_POINT_PARAMETERS)) { + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX]; + GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, tmpvalue.f); + checkGLcall("glPointParameterfEXT(...);"); + } else { + FIXME("WINED3DRS_POINTSIZE_MAX not supported on this opengl\n"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1106,7 +1121,7 @@ const struct StateEntry StateTable[] = { /*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 }, - { /*166, WINED3DRS_POINTSIZE_MAX */ STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_unknown }, + { /*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_unknown }, { /*169, Undefined */ 0, state_undefined },

1 0

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

11 Dec '06

Module: wine Branch: master Commit: 6a5d7df74f5fba4c509ce4ff735da382028eacf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5d7df74f5fba4c509ce4ff7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:01 2006 +0100 wined3d: Move WINED3DRS_LINEPATTERN to the state table. --- dlls/wined3d/device.c | 23 +---------------------- dlls/wined3d/state.c | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 42d9308..0e13085 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3389,29 +3389,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_SPECULARMATERIALSOURCE : case WINED3DRS_AMBIENTMATERIALSOURCE : case WINED3DRS_EMISSIVEMATERIALSOURCE : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_LINEPATTERN : - { - union { - DWORD d; - WINED3DLINEPATTERN lp; - } tmppattern; - tmppattern.d = Value; - - TRACE("Line pattern: repeat %d bits %x\n", tmppattern.lp.wRepeatFactor, tmppattern.lp.wLinePattern); - - if (tmppattern.lp.wRepeatFactor) { - glLineStipple(tmppattern.lp.wRepeatFactor, tmppattern.lp.wLinePattern); - checkGLcall("glLineStipple(repeat, linepattern)"); - glEnable(GL_LINE_STIPPLE); - checkGLcall("glEnable(GL_LINE_STIPPLE);"); - } else { - glDisable(GL_LINE_STIPPLE); - checkGLcall("glDisable(GL_LINE_STIPPLE);"); - } - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_ZBIAS : /* D3D8 only */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 24006cd..155872b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -849,6 +849,26 @@ static void state_colormat(DWORD state, } } +static void state_linepattern(DWORD state, IWineD3DStateBlockImpl *stateblock) { + union { + DWORD d; + WINED3DLINEPATTERN lp; + } tmppattern; + tmppattern.d = stateblock->renderState[WINED3DRS_LINEPATTERN]; + + TRACE("Line pattern: repeat %d bits %x\n", tmppattern.lp.wRepeatFactor, tmppattern.lp.wLinePattern); + + if (tmppattern.lp.wRepeatFactor) { + glLineStipple(tmppattern.lp.wRepeatFactor, tmppattern.lp.wLinePattern); + checkGLcall("glLineStipple(repeat, linepattern)"); + glEnable(GL_LINE_STIPPLE); + checkGLcall("glEnable(GL_LINE_STIPPLE);"); + } else { + glDisable(GL_LINE_STIPPLE); + checkGLcall("glDisable(GL_LINE_STIPPLE);"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -862,7 +882,7 @@ const struct StateEntry StateTable[] = { /* 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_shademode }, - { /* 10, WINED3DRS_LINEPATTERN */ STATE_RENDER(WINED3DRS_LINEPATTERN), state_unknown }, + { /* 10, WINED3DRS_LINEPATTERN */ STATE_RENDER(WINED3DRS_LINEPATTERN), state_linepattern }, { /* 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 },

1 0

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

11 Dec '06

Module: wine Branch: master Commit: dd6f5a5437fe502bce8d7a7518f4440dc4d21a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd6f5a5437fe502bce8d7a751… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:19:57 2006 +0100 wined3d: Move WINED3DRS_ZBIAS to the state table. --- dlls/wined3d/device.c | 25 +------------------------ dlls/wined3d/state.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0e13085..48e3fc7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3390,31 +3390,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_AMBIENTMATERIALSOURCE : case WINED3DRS_EMISSIVEMATERIALSOURCE : case WINED3DRS_LINEPATTERN : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_ZBIAS : /* D3D8 only */ - { - if (Value) { - tmpvalue.d = Value; - TRACE("ZBias value %f\n", tmpvalue.f); - glPolygonOffset(0, -tmpvalue.f); - checkGLcall("glPolygonOffset(0, -Value)"); - glEnable(GL_POLYGON_OFFSET_FILL); - checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL);"); - glEnable(GL_POLYGON_OFFSET_LINE); - checkGLcall("glEnable(GL_POLYGON_OFFSET_LINE);"); - glEnable(GL_POLYGON_OFFSET_POINT); - checkGLcall("glEnable(GL_POLYGON_OFFSET_POINT);"); - } else { - glDisable(GL_POLYGON_OFFSET_FILL); - checkGLcall("glDisable(GL_POLYGON_OFFSET_FILL);"); - glDisable(GL_POLYGON_OFFSET_LINE); - checkGLcall("glDisable(GL_POLYGON_OFFSET_LINE);"); - glDisable(GL_POLYGON_OFFSET_POINT); - checkGLcall("glDisable(GL_POLYGON_OFFSET_POINT);"); - } - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_NORMALIZENORMALS : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 155872b..717ec14 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -869,6 +869,33 @@ static void state_linepattern(DWORD stat } } +static void state_zbias(DWORD state, IWineD3DStateBlockImpl *stateblock) { + union { + DWORD d; + float f; + } tmpvalue; + + if (stateblock->renderState[WINED3DRS_ZBIAS]) { + tmpvalue.d = stateblock->renderState[WINED3DRS_ZBIAS]; + TRACE("ZBias value %f\n", tmpvalue.f); + glPolygonOffset(0, -tmpvalue.f); + checkGLcall("glPolygonOffset(0, -Value)"); + glEnable(GL_POLYGON_OFFSET_FILL); + checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL);"); + glEnable(GL_POLYGON_OFFSET_LINE); + checkGLcall("glEnable(GL_POLYGON_OFFSET_LINE);"); + glEnable(GL_POLYGON_OFFSET_POINT); + checkGLcall("glEnable(GL_POLYGON_OFFSET_POINT);"); + } else { + glDisable(GL_POLYGON_OFFSET_FILL); + checkGLcall("glDisable(GL_POLYGON_OFFSET_FILL);"); + glDisable(GL_POLYGON_OFFSET_LINE); + checkGLcall("glDisable(GL_POLYGON_OFFSET_LINE);"); + glDisable(GL_POLYGON_OFFSET_POINT); + checkGLcall("glDisable(GL_POLYGON_OFFSET_POINT);"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -919,7 +946,7 @@ const struct StateEntry StateTable[] = { /* 44, WINED3DRS_TEXTUREADDRESSU */ 0, /* Handled in ddraw */ state_undefined }, { /* 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 }, + { /* 47, WINED3DRS_ZBIAS */ STATE_RENDER(WINED3DRS_ZBIAS), state_zbias }, { /* 48, WINED3DRS_RANGEFOGENABLE */ 0, state_nogl }, { /* 49, WINED3DRS_ANISOTROPY */ STATE_RENDER(WINED3DRS_ANISOTROPY), state_unknown }, { /* 50, WINED3DRS_FLUSHBATCH */ STATE_RENDER(WINED3DRS_FLUSHBATCH), state_unknown },

1 0

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

11 Dec '06

Module: wine Branch: master Commit: 2ea57677d3d9000365e85eeb8b1779b0cbf89cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea57677d3d9000365e85eeb8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:05 2006 +0100 wined3d: Move WINED3DRS_NORMALIZENORMALS to the state table. --- dlls/wined3d/device.c | 11 +---------- dlls/wined3d/state.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 48e3fc7..d28ce6e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3391,17 +3391,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_EMISSIVEMATERIALSOURCE : case WINED3DRS_LINEPATTERN : case WINED3DRS_ZBIAS : /* D3D8 only */ - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_NORMALIZENORMALS : - if (Value) { - glEnable(GL_NORMALIZE); - checkGLcall("glEnable(GL_NORMALIZE);"); - } else { - glDisable(GL_NORMALIZE); - checkGLcall("glDisable(GL_NORMALIZE);"); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_POINTSIZE : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 717ec14..b635df0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -896,6 +896,17 @@ static void state_zbias(DWORD state, IWi } } + +static void state_normalize(DWORD state, IWineD3DStateBlockImpl *stateblock) { + if (stateblock->renderState[WINED3DRS_NORMALIZENORMALS]) { + glEnable(GL_NORMALIZE); + checkGLcall("glEnable(GL_NORMALIZE);"); + } else { + glDisable(GL_NORMALIZE); + checkGLcall("glDisable(GL_NORMALIZE);"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1044,7 +1055,7 @@ const struct StateEntry StateTable[] = { /*140, WINED3DRS_FOGVERTEXMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, { /*141, WINED3DRS_COLORVERTEX */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, { /*142, WINED3DRS_LOCALVIEWER */ STATE_RENDER(WINED3DRS_LOCALVIEWER), state_unknown }, - { /*143, WINED3DRS_NORMALIZENORMALS */ STATE_RENDER(WINED3DRS_NORMALIZENORMALS), state_unknown }, + { /*143, WINED3DRS_NORMALIZENORMALS */ STATE_RENDER(WINED3DRS_NORMALIZENORMALS), state_normalize }, { /*144, WINED3DRS_COLORKEYBLENDENABLE */ STATE_RENDER(WINED3DRS_COLORKEYBLENDENABLE), state_unknown }, { /*145, WINED3DRS_DIFFUSEMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, { /*146, WINED3DRS_SPECULARMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat },

1 0

Vitaliy Margolen : dinput: No need to copy default constant format. Use already defined static instead.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: c17e06d5c0e456d3052a1b6de688956f87c59d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c17e06d5c0e456d3052a1b6de… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 10 14:15:08 2006 -0700 dinput: No need to copy default constant format. Use already defined static instead. --- dlls/dinput/joystick_linuxinput.c | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index c5a35a1..369c26d 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -136,7 +136,6 @@ struct JoystickImpl int joyfd; - LPDIDATAFORMAT internal_df; LPDIDATAFORMAT df; DataFormat *transform; /* wine to user format converter */ int *offsets; /* object offsets */ @@ -408,27 +407,13 @@ static JoystickImpl *alloc_device(REFGUI goto FAILED; CopyMemory(newDevice->df->rgodf,c_dfDIJoystick2.rgodf,c_dfDIJoystick2.dwNumObjs*c_dfDIJoystick2.dwObjSize); - /* no do the same for the internal df */ - newDevice->internal_df = HeapAlloc(GetProcessHeap(),0,c_dfDIJoystick2.dwSize); - if (newDevice->internal_df == 0) - goto FAILED; - CopyMemory(newDevice->internal_df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize); - - /* copy default objects */ - newDevice->internal_df->rgodf = HeapAlloc(GetProcessHeap(),0,c_dfDIJoystick2.dwNumObjs*c_dfDIJoystick2.dwObjSize); - if (newDevice->internal_df->rgodf == 0) - goto FAILED; - CopyMemory(newDevice->internal_df->rgodf,c_dfDIJoystick2.rgodf,c_dfDIJoystick2.dwNumObjs*c_dfDIJoystick2.dwObjSize); - /* create an offsets array */ newDevice->offsets = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,c_dfDIJoystick2.dwNumObjs*sizeof(int)); if (newDevice->offsets == 0) goto FAILED; - calculate_ids(newDevice->internal_df); - /* create the default transform filter */ - newDevice->transform = create_DataFormat(newDevice->internal_df, newDevice->df, newDevice->offsets); + newDevice->transform = create_DataFormat(&c_dfDIJoystick2, newDevice->df, newDevice->offsets); calculate_ids(newDevice->df); return newDevice; @@ -436,8 +421,6 @@ static JoystickImpl *alloc_device(REFGUI FAILED: HeapFree(GetProcessHeap(),0,newDevice->df->rgodf); HeapFree(GetProcessHeap(),0,newDevice->df); - HeapFree(GetProcessHeap(),0,newDevice->internal_df->rgodf); - HeapFree(GetProcessHeap(),0,newDevice->internal_df); HeapFree(GetProcessHeap(),0,newDevice); return NULL; } @@ -593,7 +576,7 @@ static HRESULT WINAPI JoystickAImpl_SetD } memcpy(This->df->rgodf,df->rgodf,df->dwNumObjs*df->dwObjSize); - This->transform = create_DataFormat(This->internal_df, This->df, This->offsets); + This->transform = create_DataFormat(&c_dfDIJoystick2, This->df, This->offsets); calculate_ids(This->df); return DI_OK;

1 0

Vitaliy Margolen : dinput: Move internal function calculate_ids to where it 's really used.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 267cbf82896017adc18f22cde55125137d59c9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=267cbf82896017adc18f22cde… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 10 14:15:20 2006 -0700 dinput: Move internal function calculate_ids to where it's really used. --- dlls/dinput/device.c | 49 +++++++++++++++++++++++++++++++- dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick_linux.c | 55 ------------------------------------- dlls/dinput/joystick_linuxinput.c | 54 ------------------------------------ dlls/dinput/mouse.c | 2 +- 5 files changed, 49 insertions(+), 113 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8b97875..bee9ff7 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -287,7 +287,50 @@ void release_DataFormat(DataFormat * for HeapFree(GetProcessHeap(), 0, format->dt); } -DataFormat *create_DataFormat(const DIDATAFORMAT *wine_format, LPCDIDATAFORMAT asked_format, int *offset) { +/* Make all instances sequential */ +static void calculate_ids(LPDIDATAFORMAT df) +{ + int i, axis = 0, pov = 0, button = 0; + int axis_base, pov_base, button_base; + DWORD type; + + /* Make two passes over the format. The first counts the number + * for each type and the second sets the id */ + for (i = 0; i < df->dwNumObjs; i++) + { + type = DIDFT_GETTYPE(df->rgodf[i].dwType); + if (type & DIDFT_AXIS) axis++; + else if (type & DIDFT_POV) pov++; + else if (type & DIDFT_BUTTON) button++; + } + + axis_base = 0; + pov_base = axis_base + axis; + button_base = pov_base + pov; + axis = pov = button = 0; + + for (i = 0; i < df->dwNumObjs; i++) + { + type = DIDFT_GETTYPE(df->rgodf[i].dwType); + if (type & DIDFT_AXIS) + { + type |= DIDFT_MAKEINSTANCE(axis_base + axis++); + TRACE("axis type = 0x%08x\n", type); + } else if (type & DIDFT_POV) + { + type |= DIDFT_MAKEINSTANCE(pov_base + pov++); + TRACE("POV type = 0x%08x\n", type); + } else if (type & DIDFT_BUTTON) + { + type |= DIDFT_MAKEINSTANCE(button_base + button++); + TRACE("button type = 0x%08x\n", type); + } + df->rgodf[i].dwType = type; + } +} + +DataFormat *create_DataFormat(LPCDIDATAFORMAT wine_format, LPDIDATAFORMAT asked_format, int *offset) +{ DataFormat *ret; DataTransform *dt; unsigned int i, j; @@ -404,7 +447,9 @@ DataFormat *create_DataFormat(const DIDA } HeapFree(GetProcessHeap(), 0, done); - + + /* Last step - reset all instances of the new format */ + calculate_ids(asked_format); return ret; } diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 4e63af4..84b6d02 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -60,7 +60,7 @@ typedef struct { DataTransform *dt; } DataFormat; extern void fill_DataFormat(void *out, const void *in, DataFormat *df) ; -extern DataFormat *create_DataFormat(const DIDATAFORMAT *wine_format, LPCDIDATAFORMAT asked_format, int *offset) ; +extern DataFormat *create_DataFormat(LPCDIDATAFORMAT wine_format, LPDIDATAFORMAT asked_format, int *offset); extern void release_DataFormat(DataFormat *df) ; extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 474678c..0fb7e22 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -393,57 +393,6 @@ static HRESULT setup_dinput_options(Joys return DI_OK; } -static void calculate_ids(JoystickImpl* device) -{ - int i; - int axis = 0; - int button = 0; - int pov = 0; - int axis_base; - int pov_base; - int button_base; - - /* Make two passes over the format. The first counts the number - * for each type and the second sets the id */ - for (i = 0; i < device->user_df->dwNumObjs; i++) { - if (DIDFT_GETTYPE(device->user_df->rgodf[i].dwType) & DIDFT_AXIS) - axis++; - else if (DIDFT_GETTYPE(device->user_df->rgodf[i].dwType) & DIDFT_POV) - pov++; - else if (DIDFT_GETTYPE(device->user_df->rgodf[i].dwType) & DIDFT_BUTTON) - button++; - } - - axis_base = 0; - pov_base = axis; - button_base = axis + pov; - - axis = 0; - button = 0; - pov = 0; - - for (i = 0; i < device->user_df->dwNumObjs; i++) { - DWORD type = 0; - if (DIDFT_GETTYPE(device->user_df->rgodf[i].dwType) & DIDFT_AXIS) { - axis++; - type = DIDFT_GETTYPE(device->user_df->rgodf[i].dwType) | - DIDFT_MAKEINSTANCE(axis + axis_base); - TRACE("axis type = 0x%08x\n", type); - } else if (DIDFT_GETTYPE(device->user_df->rgodf[i].dwType) & DIDFT_POV) { - pov++; - type = DIDFT_GETTYPE(device->user_df->rgodf[i].dwType) | - DIDFT_MAKEINSTANCE(pov + pov_base); - TRACE("POV type = 0x%08x\n", type); - } else if (DIDFT_GETTYPE(device->user_df->rgodf[i].dwType) & DIDFT_BUTTON) { - button++; - type = DIDFT_GETTYPE(device->user_df->rgodf[i].dwType) | - DIDFT_MAKEINSTANCE(button + button_base); - TRACE("button type = 0x%08x\n", type); - } - device->user_df->rgodf[i].dwType = type; - } -} - static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, LPDIRECTINPUTDEVICEA* pdev) { DWORD i; @@ -554,8 +503,6 @@ static HRESULT alloc_device(REFGUID rgui /* create the default transform filter */ newDevice->transform = create_DataFormat(&c_dfDIJoystick2, newDevice->user_df, newDevice->offsets); - calculate_ids(newDevice); - IDirectInputDevice_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); newDevice->devcaps.dwSize = sizeof(newDevice->devcaps); @@ -765,8 +712,6 @@ static HRESULT WINAPI JoystickAImpl_SetD } This->transform = create_DataFormat(&c_dfDIJoystick2, This->user_df, This->offsets); - calculate_ids(This); - return DI_OK; FAILED: diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 369c26d..2fe0b7c 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -152,7 +152,6 @@ static DWORD map_pov(int event_value, in static void find_joydevs(void); static int lxinput_to_user_offset(JoystickImpl *This, int ie_type, int ie_code); static int offset_to_object(JoystickImpl *This, int offset); -static void calculate_ids(LPDIDATAFORMAT df); /* This GUID is slightly different from the linux joystick one. Take note. */ static const GUID DInput_Wine_Joystick_Base_GUID = { /* 9e573eda-7734-11d2-8d4a-23903fb6bdf7 */ @@ -414,7 +413,6 @@ static JoystickImpl *alloc_device(REFGUI /* create the default transform filter */ newDevice->transform = create_DataFormat(&c_dfDIJoystick2, newDevice->df, newDevice->offsets); - calculate_ids(newDevice->df); return newDevice; @@ -577,7 +575,6 @@ static HRESULT WINAPI JoystickAImpl_SetD memcpy(This->df->rgodf,df->rgodf,df->dwNumObjs*df->dwObjSize); This->transform = create_DataFormat(&c_dfDIJoystick2, This->df, This->offsets); - calculate_ids(This->df); return DI_OK; } @@ -798,57 +795,6 @@ static int offset_to_object(JoystickImpl return -1; } -static void calculate_ids(LPDIDATAFORMAT df) -{ - int i; - int axis = 0; - int button = 0; - int pov = 0; - int axis_base; - int pov_base; - int button_base; - - /* Make two passes over the format. The first counts the number - * for each type and the second sets the id */ - for (i = 0; i < df->dwNumObjs; i++) { - if (DIDFT_GETTYPE(df->rgodf[i].dwType) & DIDFT_AXIS) - axis++; - else if (DIDFT_GETTYPE(df->rgodf[i].dwType) & DIDFT_POV) - pov++; - else if (DIDFT_GETTYPE(df->rgodf[i].dwType) & DIDFT_BUTTON) - button++; - } - - axis_base = 0; - pov_base = axis; - button_base = axis + pov; - - axis = 0; - button = 0; - pov = 0; - - for (i = 0; i < df->dwNumObjs; i++) { - DWORD type = 0; - if (DIDFT_GETTYPE(df->rgodf[i].dwType) & DIDFT_AXIS) { - axis++; - type = DIDFT_GETTYPE(df->rgodf[i].dwType) | - DIDFT_MAKEINSTANCE(axis + axis_base); - TRACE("axis type = 0x%08x\n", type); - } else if (DIDFT_GETTYPE(df->rgodf[i].dwType) & DIDFT_POV) { - pov++; - type = DIDFT_GETTYPE(df->rgodf[i].dwType) | - DIDFT_MAKEINSTANCE(pov + pov_base); - TRACE("POV type = 0x%08x\n", type); - } else if (DIDFT_GETTYPE(df->rgodf[i].dwType) & DIDFT_BUTTON) { - button++; - type = DIDFT_GETTYPE(df->rgodf[i].dwType) | - DIDFT_MAKEINSTANCE(button + button_base); - TRACE("button type = 0x%08x\n", type); - } - df->rgodf[i].dwType = type; - } -} - static void joy_polldev(JoystickImpl *This) { struct pollfd plfd; struct input_event ie; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 0ede9ce..bcb16fa 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -366,7 +366,7 @@ static HRESULT WINAPI SysMouseAImpl_SetD memcpy(This->df->rgodf,df->rgodf,df->dwNumObjs*df->dwObjSize); /* Prepare all the data-conversion filters */ - This->wine_df = create_DataFormat(&(Wine_InternalMouseFormat), df, This->offset_array); + This->wine_df = create_DataFormat(&Wine_InternalMouseFormat, This->df, This->offset_array); return DI_OK; }

1 0

Vitaliy Margolen : dinput: Move few helper functions and standardize them.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 68176eeda1862a3c8fe631dc9e3da149a085bd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68176eeda1862a3c8fe631dc9… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 10 14:15:29 2006 -0700 dinput: Move few helper functions and standardize them. --- dlls/dinput/device.c | 36 ++++++++++++++++++++++ dlls/dinput/device_private.h | 3 ++ dlls/dinput/joystick_linux.c | 49 ++++++------------------------ dlls/dinput/joystick_linuxinput.c | 59 ++++--------------------------------- 4 files changed, 55 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68176eeda1862a3c8fe63…

1 0

Andrew Talbot : cryptdll: Change storage class of module handle to static.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 0c305a3492a01522baf66d0bed8c2722a7a7d05c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c305a3492a01522baf66d0be… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Dec 9 22:49:08 2006 +0000 cryptdll: Change storage class of module handle to static. --- dlls/cryptdll/cryptdll.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptdll/cryptdll.c b/dlls/cryptdll/cryptdll.c index c03ae56..72fcf68 100644 --- a/dlls/cryptdll/cryptdll.c +++ b/dlls/cryptdll/cryptdll.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptdll); -HMODULE CRYPTDLL_hModule = 0; +static HMODULE CRYPTDLL_hModule; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {

1 0