October 2006 - Wine-commits

lostwages/news 2006102901.xml
by Jeremy Newman 30 Oct '06

30 Oct '06

ChangeSet ID: 29368 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/10/30 09:32:00 Added files: news : 2006102901.xml Log message: Tom Wickline <twickline(a)gmail.com> News Wine 0.9.24 release Patch: http://cvs.winehq.org/patch.py?id=29368 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006102901.xml Index: lostwages/news/2006102901.xml diff -u -p /dev/null lostwages/news/2006102901.xml:1.1 --- /dev/null 30 Oct 2006 15:32: 0 -0000 +++ lostwages/news/2006102901.xml 30 Oct 2006 15:32: 0 -0000 @@ -0,0 +1,26 @@ +<news> + <date>October 29, 2006</date> + <title>Wine 0.9.24 Released</title> + <body> +<p>Wine 0.9.24 came out today and includes the following enhancements:</p> + +<ul> +<li>Support for multiple monitors using Xinerama.</li> +<li>Various MSI fixes and improvements.</li> +<li>A ton of memory leaks fixed.</li> +<li>Many common controls fixes.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> + Binary packages are in the process of being built and it may take a few days + for them to appear, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.24.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.128">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. +</p> + + </body> +</news>

1 0

Ivan Gyurdiev : wined3d: Add D3DMATERIALCOLORSOURCE to the WINED3D namespace.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 908853f63d9e301653e306080bef839b1ea4d857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908853f63d9e301653e306080… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Oct 29 21:45:23 2006 -0500 wined3d: Add D3DMATERIALCOLORSOURCE to the WINED3D namespace. --- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/stateblock.c | 8 ++++---- include/wine/wined3d_types.h | 8 ++++++++ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a0c5c95..7e2d859 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4067,17 +4067,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl This->stateBlock->renderState[WINED3DRS_EMISSIVEMATERIALSOURCE], This->stateBlock->renderState[WINED3DRS_SPECULARMATERIALSOURCE]); - if (This->stateBlock->renderState[WINED3DRS_DIFFUSEMATERIALSOURCE] == D3DMCS_COLOR1) { - if (This->stateBlock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE] == D3DMCS_COLOR1) { + if (This->stateBlock->renderState[WINED3DRS_DIFFUSEMATERIALSOURCE] == WINED3DMCS_COLOR1) { + if (This->stateBlock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_AMBIENT_AND_DIFFUSE; } else { Parm = GL_DIFFUSE; } - } else if (This->stateBlock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE] == D3DMCS_COLOR1) { + } else if (This->stateBlock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_AMBIENT; - } else if (This->stateBlock->renderState[WINED3DRS_EMISSIVEMATERIALSOURCE] == D3DMCS_COLOR1) { + } else if (This->stateBlock->renderState[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_EMISSION; - } else if (This->stateBlock->renderState[WINED3DRS_SPECULARMATERIALSOURCE] == D3DMCS_COLOR1) { + } else if (This->stateBlock->renderState[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_SPECULAR; } else { Parm = -1; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3038905..0a850e5 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -904,10 +904,10 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_COLORVERTEX, TRUE); IWineD3DDevice_SetRenderState(device, WINED3DRS_LOCALVIEWER, TRUE); IWineD3DDevice_SetRenderState(device, WINED3DRS_NORMALIZENORMALS, FALSE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_COLOR1); - IWineD3DDevice_SetRenderState(device, WINED3DRS_SPECULARMATERIALSOURCE, D3DMCS_COLOR2); - IWineD3DDevice_SetRenderState(device, WINED3DRS_AMBIENTMATERIALSOURCE, D3DMCS_MATERIAL); - IWineD3DDevice_SetRenderState(device, WINED3DRS_EMISSIVEMATERIALSOURCE, D3DMCS_MATERIAL); + IWineD3DDevice_SetRenderState(device, WINED3DRS_DIFFUSEMATERIALSOURCE, WINED3DMCS_COLOR1); + IWineD3DDevice_SetRenderState(device, WINED3DRS_SPECULARMATERIALSOURCE, WINED3DMCS_COLOR2); + IWineD3DDevice_SetRenderState(device, WINED3DRS_AMBIENTMATERIALSOURCE, WINED3DMCS_MATERIAL); + IWineD3DDevice_SetRenderState(device, WINED3DRS_EMISSIVEMATERIALSOURCE, WINED3DMCS_MATERIAL); IWineD3DDevice_SetRenderState(device, WINED3DRS_VERTEXBLEND, WINED3DVBF_DISABLE); IWineD3DDevice_SetRenderState(device, WINED3DRS_CLIPPLANEENABLE, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_SOFTWAREVERTEXPROCESSING, FALSE); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 8b72a7b..50189a7 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -547,6 +547,14 @@ typedef enum _WINED3DSTENCILOP { WINED3DSTENCILOP_FORCE_DWORD = 0x7fffffff } WINED3DSTENCILOP; +typedef enum _WINED3DMATERIALCOLORSOURCE { + WINED3DMCS_MATERIAL = 0, + WINED3DMCS_COLOR1 = 1, + WINED3DMCS_COLOR2 = 2, + + WINED3DMCS_FORCE_DWORD = 0x7fffffff +} WINED3DMATERIALCOLORSOURCE; + typedef struct _WINED3DDISPLAYMODE { UINT Width; UINT Height;

1 0

Ivan Gyurdiev : wined3d: Add D3DCMPFUNC to the WINED3D namespace.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 206d248e4864f5ece30ea9295e0639959f5905dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=206d248e4864f5ece30ea9295… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Oct 29 21:44:58 2006 -0500 wined3d: Add D3DCMPFUNC to the WINED3D namespace. --- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/utils.c | 20 ++++++++++---------- include/wine/wined3d_types.h | 13 +++++++++++++ 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 15d8cce..3038905 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -854,8 +854,8 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLEND, WINED3DBLEND_ONE); IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLEND, WINED3DBLEND_ZERO); IWineD3DDevice_SetRenderState(device, WINED3DRS_CULLMODE, WINED3DCULL_CCW); - IWineD3DDevice_SetRenderState(device, WINED3DRS_ZFUNC, D3DCMP_LESSEQUAL); - IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAFUNC, D3DCMP_ALWAYS); + IWineD3DDevice_SetRenderState(device, WINED3DRS_ZFUNC, WINED3DCMP_LESSEQUAL); + IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAFUNC, WINED3DCMP_ALWAYS); IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAREF, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_DITHERENABLE, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHABLENDENABLE, FALSE); @@ -886,7 +886,7 @@ static HRESULT WINAPI IWineD3DStateBloc */ This->renderState[WINED3DRS_STENCILREF] = 0; This->renderState[WINED3DRS_STENCILMASK] = 0xFFFFFFFF; - IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILFUNC, D3DCMP_ALWAYS); + IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILFUNC, WINED3DCMP_ALWAYS); IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILWRITEMASK, 0xFFFFFFFF); IWineD3DDevice_SetRenderState(device, WINED3DRS_TEXTUREFACTOR, 0xFFFFFFFF); IWineD3DDevice_SetRenderState(device, WINED3DRS_WRAP0, 0); @@ -957,7 +957,7 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_CCW_STENCILFAIL, WINED3DSTENCILOP_KEEP); IWineD3DDevice_SetRenderState(device, WINED3DRS_CCW_STENCILZFAIL, WINED3DSTENCILOP_KEEP); IWineD3DDevice_SetRenderState(device, WINED3DRS_CCW_STENCILPASS, WINED3DSTENCILOP_KEEP); - IWineD3DDevice_SetRenderState(device, WINED3DRS_CCW_STENCILFUNC, D3DCMP_ALWAYS); + IWineD3DDevice_SetRenderState(device, WINED3DRS_CCW_STENCILFUNC, WINED3DCMP_ALWAYS); IWineD3DDevice_SetRenderState(device, WINED3DRS_COLORWRITEENABLE1, 0x0000000F); IWineD3DDevice_SetRenderState(device, WINED3DRS_COLORWRITEENABLE2, 0x0000000F); IWineD3DDevice_SetRenderState(device, WINED3DRS_COLORWRITEENABLE3, 0x0000000F); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3a29e9d..398f37d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -666,17 +666,17 @@ GLenum StencilOp(DWORD op) { } GLenum CompareFunc(DWORD func) { - switch ((D3DCMPFUNC)func) { - case D3DCMP_NEVER : return GL_NEVER; - case D3DCMP_LESS : return GL_LESS; - case D3DCMP_EQUAL : return GL_EQUAL; - case D3DCMP_LESSEQUAL : return GL_LEQUAL; - case D3DCMP_GREATER : return GL_GREATER; - case D3DCMP_NOTEQUAL : return GL_NOTEQUAL; - case D3DCMP_GREATEREQUAL : return GL_GEQUAL; - case D3DCMP_ALWAYS : return GL_ALWAYS; + switch ((WINED3DCMPFUNC)func) { + case WINED3DCMP_NEVER : return GL_NEVER; + case WINED3DCMP_LESS : return GL_LESS; + case WINED3DCMP_EQUAL : return GL_EQUAL; + case WINED3DCMP_LESSEQUAL : return GL_LEQUAL; + case WINED3DCMP_GREATER : return GL_GREATER; + case WINED3DCMP_NOTEQUAL : return GL_NOTEQUAL; + case WINED3DCMP_GREATEREQUAL : return GL_GEQUAL; + case WINED3DCMP_ALWAYS : return GL_ALWAYS; default: - FIXME("Unrecognized D3DCMPFUNC value %d\n", func); + FIXME("Unrecognized WINED3DCMPFUNC value %d\n", func); return 0; } } diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 59dfb4c..8b72a7b 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -480,6 +480,19 @@ typedef enum _WINED3DVERTEXBLENDFLAGS { WINED3DVBF_0WEIGHTS = 256 } WINED3DVERTEXBLENDFLAGS; +typedef enum _WINED3DCMPFUNC { + WINED3DCMP_NEVER = 1, + WINED3DCMP_LESS = 2, + WINED3DCMP_EQUAL = 3, + WINED3DCMP_LESSEQUAL = 4, + WINED3DCMP_GREATER = 5, + WINED3DCMP_NOTEQUAL = 6, + WINED3DCMP_GREATEREQUAL = 7, + WINED3DCMP_ALWAYS = 8, + + WINED3DCMP_FORCE_DWORD = 0x7fffffff +} WINED3DCMPFUNC; + typedef enum _WINED3DZBUFFERTYPE { WINED3DZB_FALSE = 0, WINED3DZB_TRUE = 1,

1 0

Ivan Gyurdiev : wined3d: Add D3DSTENCILOP to the WINED3D namespace.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 2b6deb863729e09e370e627fe9277af166fcc4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6deb863729e09e370e627fe… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Oct 29 21:44:22 2006 -0500 wined3d: Add D3DSTENCILOP to the WINED3D namespace. --- dlls/wined3d/stateblock.c | 12 ++++++------ dlls/wined3d/utils.c | 16 ++++++++-------- include/wine/wined3d_types.h | 13 +++++++++++++ 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index bd3e8b4..15d8cce 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -874,9 +874,9 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_ZBIAS, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_RANGEFOGENABLE, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILENABLE, FALSE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILFAIL, D3DSTENCILOP_KEEP); - IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP); - IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILPASS, D3DSTENCILOP_KEEP); + IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILFAIL, WINED3DSTENCILOP_KEEP); + IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILZFAIL, WINED3DSTENCILOP_KEEP); + IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILPASS, WINED3DSTENCILOP_KEEP); /* Setting stencil func also uses values for stencil ref/mask, so manually set defaults * so only a single call performed (and ensure defaults initialized before making that call) @@ -954,9 +954,9 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_ADAPTIVETESS_W, tmpfloat.d); IWineD3DDevice_SetRenderState(device, WINED3DRS_ENABLEADAPTIVETESSELLATION, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_TWOSIDEDSTENCILMODE, FALSE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_CCW_STENCILFAIL, D3DSTENCILOP_KEEP); - IWineD3DDevice_SetRenderState(device, WINED3DRS_CCW_STENCILZFAIL, D3DSTENCILOP_KEEP); - IWineD3DDevice_SetRenderState(device, WINED3DRS_CCW_STENCILPASS, D3DSTENCILOP_KEEP); + IWineD3DDevice_SetRenderState(device, WINED3DRS_CCW_STENCILFAIL, WINED3DSTENCILOP_KEEP); + IWineD3DDevice_SetRenderState(device, WINED3DRS_CCW_STENCILZFAIL, WINED3DSTENCILOP_KEEP); + IWineD3DDevice_SetRenderState(device, WINED3DRS_CCW_STENCILPASS, WINED3DSTENCILOP_KEEP); IWineD3DDevice_SetRenderState(device, WINED3DRS_CCW_STENCILFUNC, D3DCMP_ALWAYS); IWineD3DDevice_SetRenderState(device, WINED3DRS_COLORWRITEENABLE1, 0x0000000F); IWineD3DDevice_SetRenderState(device, WINED3DRS_COLORWRITEENABLE2, 0x0000000F); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1e2975e..3a29e9d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -651,14 +651,14 @@ #undef POOL_TO_STR */ GLenum StencilOp(DWORD op) { switch(op) { - case D3DSTENCILOP_KEEP : return GL_KEEP; - case D3DSTENCILOP_ZERO : return GL_ZERO; - case D3DSTENCILOP_REPLACE : return GL_REPLACE; - case D3DSTENCILOP_INCRSAT : return GL_INCR; - case D3DSTENCILOP_DECRSAT : return GL_DECR; - case D3DSTENCILOP_INVERT : return GL_INVERT; - case D3DSTENCILOP_INCR : return GL_INCR_WRAP_EXT; - case D3DSTENCILOP_DECR : return GL_DECR_WRAP_EXT; + case WINED3DSTENCILOP_KEEP : return GL_KEEP; + case WINED3DSTENCILOP_ZERO : return GL_ZERO; + case WINED3DSTENCILOP_REPLACE : return GL_REPLACE; + case WINED3DSTENCILOP_INCRSAT : return GL_INCR; + case WINED3DSTENCILOP_DECRSAT : return GL_DECR; + case WINED3DSTENCILOP_INVERT : return GL_INVERT; + case WINED3DSTENCILOP_INCR : return GL_INCR_WRAP_EXT; + case WINED3DSTENCILOP_DECR : return GL_DECR_WRAP_EXT; default: FIXME("Unrecognized stencil op %d\n", op); return GL_KEEP; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 529b65a..59dfb4c 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -521,6 +521,19 @@ typedef enum _WINED3DCULL { WINED3DCULL_FORCE_DWORD = 0x7fffffff } WINED3DCULL; +typedef enum _WINED3DSTENCILOP { + WINED3DSTENCILOP_KEEP = 1, + WINED3DSTENCILOP_ZERO = 2, + WINED3DSTENCILOP_REPLACE = 3, + WINED3DSTENCILOP_INCRSAT = 4, + WINED3DSTENCILOP_DECRSAT = 5, + WINED3DSTENCILOP_INVERT = 6, + WINED3DSTENCILOP_INCR = 7, + WINED3DSTENCILOP_DECR = 8, + + WINED3DSTENCILOP_FORCE_DWORD = 0x7fffffff +} WINED3DSTENCILOP; + typedef struct _WINED3DDISPLAYMODE { UINT Width; UINT Height;

1 0

Ivan Gyurdiev : wined3d: Add D3DFILLMODE to the WINED3D namespace.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: f5cc612842bcf071fff38fed8f6fab93deb19390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5cc612842bcf071fff38fed8… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Oct 29 21:43:51 2006 -0500 wined3d: Add D3DFILLMODE to the WINED3D namespace. --- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d_types.h | 8 ++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7070d03..a0c5c95 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3431,10 +3431,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl switch (State) { case WINED3DRS_FILLMODE : - switch ((D3DFILLMODE) Value) { - case D3DFILL_POINT : glPolygonMode(GL_FRONT_AND_BACK, GL_POINT); break; - case D3DFILL_WIREFRAME : glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); break; - case D3DFILL_SOLID : glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); break; + switch ((WINED3DFILLMODE) Value) { + case WINED3DFILL_POINT : glPolygonMode(GL_FRONT_AND_BACK, GL_POINT); break; + case WINED3DFILL_WIREFRAME : glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); break; + case WINED3DFILL_SOLID : glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); break; default: FIXME("Unrecognized WINED3DRS_FILLMODE value %d\n", Value); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c28a24f..bd3e8b4 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -843,7 +843,7 @@ static HRESULT WINAPI IWineD3DStateBloc } else { IWineD3DDevice_SetRenderState(device, WINED3DRS_ZENABLE, WINED3DZB_FALSE); } - IWineD3DDevice_SetRenderState(device, WINED3DRS_FILLMODE, D3DFILL_SOLID); + IWineD3DDevice_SetRenderState(device, WINED3DRS_FILLMODE, WINED3DFILL_SOLID); IWineD3DDevice_SetRenderState(device, WINED3DRS_SHADEMODE, WINED3DSHADE_GOURAUD); lp.lp.wRepeatFactor = 0; lp.lp.wLinePattern = 0; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index c703c8b..529b65a 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -505,6 +505,14 @@ typedef enum _WINED3DSHADEMODE { WINED3DSHADE_FORCE_DWORD = 0x7fffffff } WINED3DSHADEMODE; +typedef enum _WINED3DFILLMODE { + WINED3DFILL_POINT = 1, + WINED3DFILL_WIREFRAME = 2, + WINED3DFILL_SOLID = 3, + + WINED3DFILL_FORCE_DWORD = 0x7fffffff +} WINED3DFILLMODE; + typedef enum _WINED3DCULL { WINED3DCULL_NONE = 1, WINED3DCULL_CW = 2,

1 0

Ivan Gyurdiev : wined3d: Add D3DCULL to the WINED3D namespace.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 02fb9f6f41ec5a05f854c2b55616e4432784f144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02fb9f6f41ec5a05f854c2b55… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Oct 29 21:43:18 2006 -0500 wined3d: Add D3DCULL to the WINED3D namespace. --- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d_types.h | 8 ++++++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index edd0760..7070d03 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3476,12 +3476,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl /* If we are culling "back faces with clockwise vertices" then set front faces to be counter clockwise and enable culling of back faces */ - switch ((D3DCULL) Value) { - case D3DCULL_NONE: + switch ((WINED3DCULL) Value) { + case WINED3DCULL_NONE: glDisable(GL_CULL_FACE); checkGLcall("glDisable GL_CULL_FACE"); break; - case D3DCULL_CW: + case WINED3DCULL_CW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); if (This->renderUpsideDown) { @@ -3493,7 +3493,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl } glCullFace(GL_BACK); break; - case D3DCULL_CCW: + case WINED3DCULL_CCW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); if (This->renderUpsideDown) { @@ -3506,7 +3506,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl glCullFace(GL_BACK); break; default: - FIXME("Unrecognized/Unhandled D3DCULL value %d\n", Value); + FIXME("Unrecognized/Unhandled WINED3DCULL value %d\n", Value); } break; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b8ba379..c28a24f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -853,7 +853,7 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_LASTPIXEL, TRUE); IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLEND, WINED3DBLEND_ONE); IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLEND, WINED3DBLEND_ZERO); - IWineD3DDevice_SetRenderState(device, WINED3DRS_CULLMODE, D3DCULL_CCW); + IWineD3DDevice_SetRenderState(device, WINED3DRS_CULLMODE, WINED3DCULL_CCW); IWineD3DDevice_SetRenderState(device, WINED3DRS_ZFUNC, D3DCMP_LESSEQUAL); IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAFUNC, D3DCMP_ALWAYS); IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAREF, 0); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index a72b24a..c703c8b 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -505,6 +505,14 @@ typedef enum _WINED3DSHADEMODE { WINED3DSHADE_FORCE_DWORD = 0x7fffffff } WINED3DSHADEMODE; +typedef enum _WINED3DCULL { + WINED3DCULL_NONE = 1, + WINED3DCULL_CW = 2, + WINED3DCULL_CCW = 3, + + WINED3DCULL_FORCE_DWORD = 0x7fffffff +} WINED3DCULL; + typedef struct _WINED3DDISPLAYMODE { UINT Width; UINT Height;

1 0

Ivan Gyurdiev : wined3d: Add D3DSHADEMODE to the WINED3D namespace.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 16767d21e16f1b6e0813e4315ae0518e331255a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16767d21e16f1b6e0813e4315… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Oct 29 21:42:47 2006 -0500 wined3d: Add D3DSHADEMODE to the WINED3D namespace. --- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d_types.h | 8 ++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0dc289f..edd0760 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3511,20 +3511,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl break; case WINED3DRS_SHADEMODE : - switch ((D3DSHADEMODE) Value) { - case D3DSHADE_FLAT: + switch ((WINED3DSHADEMODE) Value) { + case WINED3DSHADE_FLAT: glShadeModel(GL_FLAT); checkGLcall("glShadeModel"); break; - case D3DSHADE_GOURAUD: + case WINED3DSHADE_GOURAUD: glShadeModel(GL_SMOOTH); checkGLcall("glShadeModel"); break; - case D3DSHADE_PHONG: - FIXME("D3DSHADE_PHONG isn't supported\n"); + case WINED3DSHADE_PHONG: + FIXME("WINED3DSHADE_PHONG isn't supported\n"); break; default: - FIXME("Unrecognized/Unhandled D3DSHADEMODE value %d\n", Value); + FIXME("Unrecognized/Unhandled WINED3DSHADEMODE value %d\n", Value); } break; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 509ea38..b8ba379 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -844,7 +844,7 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_ZENABLE, WINED3DZB_FALSE); } IWineD3DDevice_SetRenderState(device, WINED3DRS_FILLMODE, D3DFILL_SOLID); - IWineD3DDevice_SetRenderState(device, WINED3DRS_SHADEMODE, D3DSHADE_GOURAUD); + IWineD3DDevice_SetRenderState(device, WINED3DRS_SHADEMODE, WINED3DSHADE_GOURAUD); lp.lp.wRepeatFactor = 0; lp.lp.wLinePattern = 0; IWineD3DDevice_SetRenderState(device, WINED3DRS_LINEPATTERN, lp.d); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index e627e23..a72b24a 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -497,6 +497,14 @@ typedef enum _WINED3DFOGMODE { WINED3DFOG_FORCE_DWORD = 0x7fffffff } WINED3DFOGMODE; +typedef enum _WINED3DSHADEMODE { + WINED3DSHADE_FLAT = 1, + WINED3DSHADE_GOURAUD = 2, + WINED3DSHADE_PHONG = 3, + + WINED3DSHADE_FORCE_DWORD = 0x7fffffff +} WINED3DSHADEMODE; + typedef struct _WINED3DDISPLAYMODE { UINT Width; UINT Height;

1 0

Ivan Gyurdiev : wined3d: Add D3DFOGMODE to the WINED3D namespace.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 4eced8ea247df69cef092b894f253df9bae459fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eced8ea247df69cef092b894… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Oct 29 21:41:42 2006 -0500 wined3d: Add D3DFOGMODE to the WINED3D namespace. --- dlls/wined3d/device.c | 24 ++++++++++++++---------- dlls/wined3d/drawprim.c | 8 ++++---- dlls/wined3d/stateblock.c | 4 ++-- include/wine/wined3d_types.h | 9 +++++++++ 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dc360db..d11c42b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3891,14 +3891,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_FOGVERTEXMODE : { /* DX 7 sdk: "If both render states(vertex and table fog) are set to valid modes, the system will apply only pixel(=table) fog effects." */ - if(This->stateBlock->renderState[WINED3DRS_FOGTABLEMODE] == D3DFOG_NONE) { + if(This->stateBlock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { glHint(GL_FOG_HINT, GL_FASTEST); checkGLcall("glHint(GL_FOG_HINT, GL_FASTEST)"); switch (This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE]) { /* Processed vertices have their fog factor stored in the specular value. Fall too the none case. * If we are drawing untransformed vertices atm, d3ddevice_set_ortho will update the fog */ - case D3DFOG_EXP: { + case WINED3DFOG_EXP: { if(!This->last_was_rhw) { glFogi(GL_FOG_MODE, GL_EXP); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP"); @@ -3911,7 +3911,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl break; } } - case D3DFOG_EXP2: { + case WINED3DFOG_EXP2: { if(!This->last_was_rhw) { glFogi(GL_FOG_MODE, GL_EXP2); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP2"); @@ -3924,7 +3924,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl break; } } - case D3DFOG_LINEAR: { + case WINED3DFOG_LINEAR: { if(!This->last_was_rhw) { glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR"); @@ -3937,7 +3937,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl break; } } - case D3DFOG_NONE: { + case WINED3DFOG_NONE: { /* Both are none? According to msdn the alpha channel of the specular * color contains a fog factor. Set it in drawStridedSlow. * Same happens with Vertexfog on transformed vertices @@ -3964,7 +3964,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl glHint(GL_FOG_HINT, GL_NICEST); checkGLcall("glHint(GL_FOG_HINT, GL_NICEST)"); switch (This->stateBlock->renderState[WINED3DRS_FOGTABLEMODE]) { - case D3DFOG_EXP: glFogi(GL_FOG_MODE, GL_EXP); + case WINED3DFOG_EXP: + glFogi(GL_FOG_MODE, GL_EXP); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP"); if(GL_SUPPORT(EXT_FOG_COORD)) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); @@ -3973,7 +3974,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DDevice_SetRenderState(iface, WINED3DRS_FOGEND, This->stateBlock->renderState[WINED3DRS_FOGEND]); } break; - case D3DFOG_EXP2: glFogi(GL_FOG_MODE, GL_EXP2); + case WINED3DFOG_EXP2: + glFogi(GL_FOG_MODE, GL_EXP2); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP2"); if(GL_SUPPORT(EXT_FOG_COORD)) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); @@ -3982,7 +3984,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DDevice_SetRenderState(iface, WINED3DRS_FOGEND, This->stateBlock->renderState[WINED3DRS_FOGEND]); } break; - case D3DFOG_LINEAR: glFogi(GL_FOG_MODE, GL_LINEAR); + case WINED3DFOG_LINEAR: + glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR"); if(GL_SUPPORT(EXT_FOG_COORD)) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); @@ -3991,8 +3994,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DDevice_SetRenderState(iface, WINED3DRS_FOGEND, This->stateBlock->renderState[WINED3DRS_FOGEND]); } break; - case D3DFOG_NONE: /* Won't happen */ - default: FIXME("Unexpected WINED3DRS_FOGTABLEMODE %d\n", This->stateBlock->renderState[WINED3DRS_FOGTABLEMODE]); + case WINED3DFOG_NONE: + default: /* Won't happen */ + FIXME("Unexpected WINED3DRS_FOGTABLEMODE %d\n", This->stateBlock->renderState[WINED3DRS_FOGTABLEMODE]); } } if (GL_SUPPORT(NV_FOG_DISTANCE)) { diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b632f65..a5bf5eb 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -201,7 +201,7 @@ void d3ddevice_set_ortho(IWineD3DDeviceI } /* Vertex fog on transformed vertices? Use the calculated fog factor stored in the specular color */ - if(This->stateBlock->renderState[WINED3DRS_FOGENABLE] && This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] != D3DFOG_NONE) { + if(This->stateBlock->renderState[WINED3DRS_FOGENABLE] && This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] != WINED3DFOG_NONE) { if(GL_SUPPORT(EXT_FOG_COORD)) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FOG_COORDINATE_EXT); checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FOG_COORDINATE_EXT)"); @@ -326,7 +326,7 @@ static void primitiveInitState( glFogf(GL_FOG_END, 0.0f); } else if(This->stateBlock->renderState[WINED3DRS_FOGENABLE] - && This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] != D3DFOG_NONE) { + && This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] != WINED3DFOG_NONE) { if(GL_SUPPORT(EXT_FOG_COORD)) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); @@ -1508,8 +1508,8 @@ static void drawStridedSlow(IWineD3DDevi if (sd->u.s.specular.lpData != NULL) { /* special case where the fog density is stored in the diffuse alpha channel */ if(This->stateBlock->renderState[WINED3DRS_FOGENABLE] && - (This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] == D3DFOG_NONE || sd->u.s.position.dwType == WINED3DDECLTYPE_FLOAT4 )&& - This->stateBlock->renderState[WINED3DRS_FOGTABLEMODE] == D3DFOG_NONE) { + (This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] == WINED3DFOG_NONE || sd->u.s.position.dwType == WINED3DDECLTYPE_FLOAT4 )&& + This->stateBlock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { if(GL_SUPPORT(EXT_FOG_COORD)) { GL_EXTCALL(glFogCoordfEXT(specularColor >> 24)); } else { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e7221a2..e1a3b22 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -863,7 +863,7 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_SPECULARENABLE, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_ZVISIBLE, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_FOGCOLOR, 0); - IWineD3DDevice_SetRenderState(device, WINED3DRS_FOGTABLEMODE, D3DFOG_NONE); + IWineD3DDevice_SetRenderState(device, WINED3DRS_FOGTABLEMODE, WINED3DFOG_NONE); tmpfloat.f = 0.0f; IWineD3DDevice_SetRenderState(device, WINED3DRS_FOGSTART, tmpfloat.d); tmpfloat.f = 1.0f; @@ -900,7 +900,7 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_CLIPPING, TRUE); IWineD3DDevice_SetRenderState(device, WINED3DRS_LIGHTING, TRUE); IWineD3DDevice_SetRenderState(device, WINED3DRS_AMBIENT, 0); - IWineD3DDevice_SetRenderState(device, WINED3DRS_FOGVERTEXMODE, D3DFOG_NONE); + IWineD3DDevice_SetRenderState(device, WINED3DRS_FOGVERTEXMODE, WINED3DFOG_NONE); IWineD3DDevice_SetRenderState(device, WINED3DRS_COLORVERTEX, TRUE); IWineD3DDevice_SetRenderState(device, WINED3DRS_LOCALVIEWER, TRUE); IWineD3DDevice_SetRenderState(device, WINED3DRS_NORMALIZENORMALS, FALSE); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 067188a..5573463 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -478,6 +478,15 @@ typedef enum _WINED3DZBUFFERTYPE { WINED3DZB_FORCE_DWORD = 0x7fffffff } WINED3DZBUFFERTYPE; +typedef enum _WINED3DFOGMODE { + WINED3DFOG_NONE = 0, + WINED3DFOG_EXP = 1, + WINED3DFOG_EXP2 = 2, + WINED3DFOG_LINEAR = 3, + + WINED3DFOG_FORCE_DWORD = 0x7fffffff +} WINED3DFOGMODE; + typedef struct _WINED3DDISPLAYMODE { UINT Width; UINT Height;

1 0

Ivan Gyurdiev : wined3d: Add D3DBLENDOP to the WINED3D namespace.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 042fa7be8b1bafe727cb09a61dc399679058f463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042fa7be8b1bafe727cb09a61… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Oct 29 21:42:14 2006 -0500 wined3d: Add D3DBLENDOP to the WINED3D namespace. --- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/stateblock.c | 4 ++-- include/wine/wined3d_types.h | 10 ++++++++++ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d11c42b..0dc289f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3716,14 +3716,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl { int glParm = GL_FUNC_ADD; - switch ((D3DBLENDOP) Value) { - case D3DBLENDOP_ADD : glParm = GL_FUNC_ADD; break; - case D3DBLENDOP_SUBTRACT : glParm = GL_FUNC_SUBTRACT; break; - case D3DBLENDOP_REVSUBTRACT : glParm = GL_FUNC_REVERSE_SUBTRACT; break; - case D3DBLENDOP_MIN : glParm = GL_MIN; break; - case D3DBLENDOP_MAX : glParm = GL_MAX; break; + switch ((WINED3DBLENDOP) Value) { + case WINED3DBLENDOP_ADD : glParm = GL_FUNC_ADD; break; + case WINED3DBLENDOP_SUBTRACT : glParm = GL_FUNC_SUBTRACT; break; + case WINED3DBLENDOP_REVSUBTRACT : glParm = GL_FUNC_REVERSE_SUBTRACT; break; + case WINED3DBLENDOP_MIN : glParm = GL_MIN; break; + case WINED3DBLENDOP_MAX : glParm = GL_MAX; break; default: - FIXME("Unrecognized/Unhandled D3DBLENDOP value %d\n", Value); + FIXME("Unrecognized/Unhandled WINED3DBLENDOP value %d\n", Value); } if(GL_SUPPORT(EXT_BLEND_MINMAX)) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e1a3b22..509ea38 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -935,7 +935,7 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_COLORWRITEENABLE, 0x0000000F); tmpfloat.f = 0.0f; IWineD3DDevice_SetRenderState(device, WINED3DRS_TWEENFACTOR, tmpfloat.d); - IWineD3DDevice_SetRenderState(device, WINED3DRS_BLENDOP, D3DBLENDOP_ADD); + IWineD3DDevice_SetRenderState(device, WINED3DRS_BLENDOP, WINED3DBLENDOP_ADD); IWineD3DDevice_SetRenderState(device, WINED3DRS_POSITIONDEGREE, WINED3DDEGREE_CUBIC); IWineD3DDevice_SetRenderState(device, WINED3DRS_NORMALDEGREE, WINED3DDEGREE_LINEAR); /* states new in d3d9 */ @@ -975,7 +975,7 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_SEPARATEALPHABLENDENABLE, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLENDALPHA, WINED3DBLEND_ONE); IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLENDALPHA, WINED3DBLEND_ZERO); - IWineD3DDevice_SetRenderState(device, WINED3DRS_BLENDOPALPHA, D3DBLENDOP_ADD); + IWineD3DDevice_SetRenderState(device, WINED3DRS_BLENDOPALPHA, WINED3DBLENDOP_ADD); /* clipping status */ This->clip_status.ClipUnion = 0; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 5573463..e627e23 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -461,6 +461,16 @@ typedef enum _WINED3DBLEND { WINED3DBLEND_FORCE_DWORD = 0x7fffffff } WINED3DBLEND; +typedef enum _WINED3DBLENDOP { + WINED3DBLENDOP_ADD = 1, + WINED3DBLENDOP_SUBTRACT = 2, + WINED3DBLENDOP_REVSUBTRACT = 3, + WINED3DBLENDOP_MIN = 4, + WINED3DBLENDOP_MAX = 5, + + WINED3DBLENDOP_FORCE_DWORD = 0x7fffffff +} WINED3DBLENDOP; + typedef enum _WINED3DVERTEXBLENDFLAGS { WINED3DVBF_DISABLE = 0, WINED3DVBF_1WEIGHTS = 1,

1 0

Ivan Gyurdiev : wined3d: Make GetTexture and GetSamplerState read from the correct stateblock.
by Alexandre Julliard 30 Oct '06

30 Oct '06

Module: wine Branch: master Commit: 69550f2c4790a109552466224d6a0e97422ceef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69550f2c4790a109552466224… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sat Oct 28 19:55:55 2006 -0400 wined3d: Make GetTexture and GetSamplerState read from the correct stateblock. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 33b4e87..dc360db 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4638,7 +4638,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl static HRESULT WINAPI IWineD3DDeviceImpl_GetSamplerState(IWineD3DDevice *iface, DWORD Sampler, WINED3DSAMPLERSTATETYPE Type, DWORD* Value) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; /** TODO: check that sampler is in range **/ - *Value = This->updateStateBlock->samplerState[Sampler][Type]; + *Value = This->stateBlock->samplerState[Sampler][Type]; TRACE("(%p) : Sampler %d Type %u Returning %d\n", This, Sampler, Type, *Value); return WINED3D_OK; @@ -5817,7 +5817,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl TRACE("Attempt to access invalid texture rejected\n"); return WINED3DERR_INVALIDCALL; } - *ppTexture=This->updateStateBlock->textures[Stage]; + *ppTexture=This->stateBlock->textures[Stage]; if (*ppTexture) IWineD3DBaseTexture_AddRef(*ppTexture);

1 0