December 2006 - Wine-Commits

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

Dec. 11, 2006

Module: wine Branch: master Commit: 287c6247abe842e406a07cd16900700676cefc07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287c6247abe842e406a07cd16… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 18:37:17 2006 +0100 wined3d: Move WINED3DRS_TEXTUREFACTOR to the state table. --- dlls/wined3d/device.c | 29 +---------------------------- dlls/wined3d/state.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 86a4252..d0bdde9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3460,35 +3460,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_CLIPPLANEENABLE : case WINED3DRS_CLIPPING : case WINED3DRS_BLENDOP : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_TEXTUREFACTOR : - { - unsigned int i; - - /* Note the texture color applies to all textures whereas - GL_TEXTURE_ENV_COLOR applies to active only */ - float col[4]; - D3DCOLORTOGLFLOAT4(Value, col); - - if (!GL_SUPPORT(NV_REGISTER_COMBINERS)) { - /* And now the default texture color as well */ - for (i = 0; i < GL_LIMITS(texture_stages); i++) { - /* Note the WINED3DRS value applies to all textures, but GL has one - per texture, so apply it now ready to be used! */ - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); - checkGLcall("glActiveTextureARB"); - } else if (i>0) { - FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); - } - - glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]); - checkGLcall("glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, color);"); - } - } - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_SPECULARENABLE : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0eaef71..549b120 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -432,6 +432,34 @@ static void state_blendop(DWORD state, I checkGLcall("glBlendEquation"); } +static void state_texfactor(DWORD state, IWineD3DStateBlockImpl *stateblock) { + unsigned int i; + + /* Note the texture color applies to all textures whereas + * GL_TEXTURE_ENV_COLOR applies to active only + */ + float col[4]; + D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_TEXTUREFACTOR], col); + + if (!GL_SUPPORT(NV_REGISTER_COMBINERS)) { + /* And now the default texture color as well */ + for (i = 0; i < GL_LIMITS(texture_stages); i++) { + /* Note the WINED3DRS value applies to all textures, but GL has one + * per texture, so apply it now ready to be used! + */ + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); + checkGLcall("glActiveTextureARB"); + } else if (i>0) { + FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); + } + + glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]); + checkGLcall("glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, color);"); + } + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -495,7 +523,7 @@ const struct StateEntry StateTable[] = { /* 57, WINED3DRS_STENCILREF */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_unknown }, { /* 58, WINED3DRS_STENCILMASK */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_unknown }, { /* 59, WINED3DRS_STENCILWRITEMASK */ STATE_RENDER(WINED3DRS_STENCILWRITEMASK), state_unknown }, - { /* 60, WINED3DRS_TEXTUREFACTOR */ STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_unknown }, + { /* 60, WINED3DRS_TEXTUREFACTOR */ STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor }, /* A BIG hole. If wanted, 'fixed' states like the vertex type or the bound shaders can be put here */ { /* 61, Undefined */ 0, state_undefined }, { /* 62, Undefined */ 0, state_undefined },

1 0

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

Dec. 11, 2006

Module: wine Branch: master Commit: ac26172c2d369834d483065b2aae6a3b603b94b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac26172c2d369834d483065b2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 20:21:43 2006 +0100 wined3d: Move WINED3DRS_BLENDOP to the state table. --- dlls/wined3d/device.c | 25 +------------------------ dlls/wined3d/state.c | 27 ++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8fd36f6..86a4252 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3459,31 +3459,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_COLORKEYENABLE : case WINED3DRS_CLIPPLANEENABLE : case WINED3DRS_CLIPPING : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_BLENDOP : - { - int glParm = GL_FUNC_ADD; - - 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 WINED3DBLENDOP value %d\n", Value); - } - - if(GL_SUPPORT(EXT_BLEND_MINMAX)) { - TRACE("glBlendEquation(%x)\n", glParm); - GL_EXTCALL(glBlendEquation(glParm)); - checkGLcall("glBlendEquation"); - } else { - WARN("Unsupported in local OpenGL implementation: glBlendEquation\n"); - } - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_TEXTUREFACTOR : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 01c24ff..0eaef71 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +#define GLINFO_LOCATION ((IWineD3DImpl *)(stateblock->wineD3DDevice->wineD3D))->gl_info + static void state_unknown(DWORD state, IWineD3DStateBlockImpl *stateblock) { /* State which does exist, but wined3d doesn't know about */ if(STATE_IS_RENDER(state)) { @@ -407,6 +409,29 @@ static void state_clipping(DWORD state, } } +static void state_blendop(DWORD state, IWineD3DStateBlockImpl *stateblock) { + int glParm = GL_FUNC_ADD; + + if(!GL_SUPPORT(EXT_BLEND_MINMAX)) { + WARN("Unsupported in local OpenGL implementation: glBlendEquation\n"); + return; + } + + switch ((WINED3DBLENDOP) stateblock->renderState[WINED3DRS_BLENDOP]) { + 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", stateblock->renderState[WINED3DRS_BLENDOP]); + } + + TRACE("glBlendEquation(%x)\n", glParm); + GL_EXTCALL(glBlendEquation(glParm)); + checkGLcall("glBlendEquation"); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -583,7 +608,7 @@ const struct StateEntry StateTable[] = { /*168, WINED3DRS_COLORWRITEENABLE */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_unknown }, { /*169, Undefined */ 0, state_undefined }, { /*170, WINED3DRS_TWEENFACTOR */ 0, state_nogl }, - { /*171, WINED3DRS_BLENDOP */ STATE_RENDER(WINED3DRS_BLENDOP), state_unknown }, + { /*171, WINED3DRS_BLENDOP */ STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }, { /*172, WINED3DRS_POSITIONDEGREE */ STATE_RENDER(WINED3DRS_POSITIONDEGREE), state_unknown }, { /*173, WINED3DRS_NORMALDEGREE */ STATE_RENDER(WINED3DRS_NORMALDEGREE), state_unknown }, /*172, WINED3DRS_POSITIONORDER */ /* Value assigned to 2 state names */

1 0

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

Dec. 11, 2006

Module: wine Branch: master Commit: 89e999ac7162d875b2763e90a9ef25b2fa8d14a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e999ac7162d875b2763e90a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 18:01:23 2006 +0100 wined3d: Move clipping states to the state table. --- dlls/wined3d/device.c | 47 +---------------------------------------------- dlls/wined3d/state.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 48 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0df7407..8fd36f6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3418,7 +3418,6 @@ static void renderstate_stencil(IWineD3D static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, WINED3DRENDERSTATETYPE State, DWORD Value) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - DWORD OldValue = This->stateBlock->renderState[State]; /* Simple way of referring to either a DWORD or a 4 byte float */ union { @@ -3458,53 +3457,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_ALPHAFUNC : case WINED3DRS_ALPHAREF : case WINED3DRS_COLORKEYENABLE : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_CLIPPLANEENABLE : case WINED3DRS_CLIPPING : - { - /* Ensure we only do the changed clip planes */ - DWORD enable = 0xFFFFFFFF; - DWORD disable = 0x00000000; - - /* If enabling / disabling all */ - if (State == WINED3DRS_CLIPPING) { - if (Value) { - enable = This->stateBlock->renderState[WINED3DRS_CLIPPLANEENABLE]; - disable = 0x00; - } else { - disable = This->stateBlock->renderState[WINED3DRS_CLIPPLANEENABLE]; - enable = 0x00; - } - } else { - enable = Value & ~OldValue; - disable = ~Value & OldValue; - } - - if (enable & WINED3DCLIPPLANE0) { glEnable(GL_CLIP_PLANE0); checkGLcall("glEnable(clip plane 0)"); } - if (enable & WINED3DCLIPPLANE1) { glEnable(GL_CLIP_PLANE1); checkGLcall("glEnable(clip plane 1)"); } - if (enable & WINED3DCLIPPLANE2) { glEnable(GL_CLIP_PLANE2); checkGLcall("glEnable(clip plane 2)"); } - if (enable & WINED3DCLIPPLANE3) { glEnable(GL_CLIP_PLANE3); checkGLcall("glEnable(clip plane 3)"); } - if (enable & WINED3DCLIPPLANE4) { glEnable(GL_CLIP_PLANE4); checkGLcall("glEnable(clip plane 4)"); } - if (enable & WINED3DCLIPPLANE5) { glEnable(GL_CLIP_PLANE5); checkGLcall("glEnable(clip plane 5)"); } - - if (disable & WINED3DCLIPPLANE0) { glDisable(GL_CLIP_PLANE0); checkGLcall("glDisable(clip plane 0)"); } - if (disable & WINED3DCLIPPLANE1) { glDisable(GL_CLIP_PLANE1); checkGLcall("glDisable(clip plane 1)"); } - if (disable & WINED3DCLIPPLANE2) { glDisable(GL_CLIP_PLANE2); checkGLcall("glDisable(clip plane 2)"); } - if (disable & WINED3DCLIPPLANE3) { glDisable(GL_CLIP_PLANE3); checkGLcall("glDisable(clip plane 3)"); } - if (disable & WINED3DCLIPPLANE4) { glDisable(GL_CLIP_PLANE4); checkGLcall("glDisable(clip plane 4)"); } - if (disable & WINED3DCLIPPLANE5) { glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); } - - /** update clipping status */ - if (enable) { - This->stateBlock->clip_status.ClipUnion = 0; - This->stateBlock->clip_status.ClipIntersection = 0xFFFFFFFF; - } else { - This->stateBlock->clip_status.ClipUnion = 0; - This->stateBlock->clip_status.ClipIntersection = 0; - } - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_BLENDOP : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 02c22b6..01c24ff 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -364,6 +364,49 @@ static void state_alpha(DWORD state, IWi /* TODO: Some texture blending operations seem to affect the alpha test */ } +static void state_clipping(DWORD state, IWineD3DStateBlockImpl *stateblock) { + DWORD enable = 0xFFFFFFFF; + DWORD disable = 0x00000000; + + /* TODO: Keep track of previously enabled clipplanes to avoid unneccessary resetting + * of already set values + */ + + /* If enabling / disabling all + * TODO: Is this correct? Doesn't D3DRS_CLIPPING disable clipping on the viewport frustrum? + */ + if (stateblock->renderState[WINED3DRS_CLIPPING]) { + enable = stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; + disable = ~stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; + } else { + disable = 0xffffffff; + enable = 0x00; + } + + if (enable & WINED3DCLIPPLANE0) { glEnable(GL_CLIP_PLANE0); checkGLcall("glEnable(clip plane 0)"); } + if (enable & WINED3DCLIPPLANE1) { glEnable(GL_CLIP_PLANE1); checkGLcall("glEnable(clip plane 1)"); } + if (enable & WINED3DCLIPPLANE2) { glEnable(GL_CLIP_PLANE2); checkGLcall("glEnable(clip plane 2)"); } + if (enable & WINED3DCLIPPLANE3) { glEnable(GL_CLIP_PLANE3); checkGLcall("glEnable(clip plane 3)"); } + if (enable & WINED3DCLIPPLANE4) { glEnable(GL_CLIP_PLANE4); checkGLcall("glEnable(clip plane 4)"); } + if (enable & WINED3DCLIPPLANE5) { glEnable(GL_CLIP_PLANE5); checkGLcall("glEnable(clip plane 5)"); } + + if (disable & WINED3DCLIPPLANE0) { glDisable(GL_CLIP_PLANE0); checkGLcall("glDisable(clip plane 0)"); } + if (disable & WINED3DCLIPPLANE1) { glDisable(GL_CLIP_PLANE1); checkGLcall("glDisable(clip plane 1)"); } + if (disable & WINED3DCLIPPLANE2) { glDisable(GL_CLIP_PLANE2); checkGLcall("glDisable(clip plane 2)"); } + if (disable & WINED3DCLIPPLANE3) { glDisable(GL_CLIP_PLANE3); checkGLcall("glDisable(clip plane 3)"); } + if (disable & WINED3DCLIPPLANE4) { glDisable(GL_CLIP_PLANE4); checkGLcall("glDisable(clip plane 4)"); } + if (disable & WINED3DCLIPPLANE5) { glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); } + + /** update clipping status */ + if (enable) { + stateblock->clip_status.ClipUnion = 0; + stateblock->clip_status.ClipIntersection = 0xFFFFFFFF; + } else { + stateblock->clip_status.ClipUnion = 0; + stateblock->clip_status.ClipIntersection = 0; + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -505,7 +548,7 @@ const struct StateEntry StateTable[] = { /*133, WINED3DRS_WRAP5 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, { /*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 }, + { /*136, WINED3DRS_CLIPPING */ STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, { /*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_ambient }, @@ -521,7 +564,7 @@ const struct StateEntry StateTable[] = { /*149, Undefined */ 0, state_undefined }, { /*150, Undefined */ 0, state_undefined }, { /*151, WINED3DRS_VERTEXBLEND */ 0, state_nogl }, - { /*152, WINED3DRS_CLIPPLANEENABLE */ STATE_RENDER(WINED3DRS_CLIPPING), state_unknown }, + { /*152, WINED3DRS_CLIPPLANEENABLE */ STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, { /*153, WINED3DRS_SOFTWAREVERTEXPROCESSING */ 0, state_nogl }, { /*154, WINED3DRS_POINTSIZE */ STATE_RENDER(WINED3DRS_POINTSIZE), state_unknown }, { /*155, WINED3DRS_POINTSIZE_MIN */ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_unknown },

1 0

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

Dec. 11, 2006

Module: wine Branch: master Commit: c88efeef056eab7a21825d6eef7907b3b7069530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88efeef056eab7a21825d6ee… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 20:21:32 2006 +0100 wined3d: Move alpha states to the state table. --- dlls/wined3d/device.c | 43 +-------------------------------------- dlls/wined3d/state.c | 54 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 51 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d0a8a0b..0df7407 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3454,52 +3454,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_DESTBLEND : case WINED3DRS_ANTIALIASEDLINEENABLE : case WINED3DRS_BLENDFACTOR : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_ALPHATESTENABLE : case WINED3DRS_ALPHAFUNC : case WINED3DRS_ALPHAREF : case WINED3DRS_COLORKEYENABLE : - { - int glParm = 0; - float ref; - BOOL enable_ckey = FALSE; - - IWineD3DSurfaceImpl *surf; - - /* Find out if the texture on the first stage has a ckey set */ - if(This->stateBlock->textures[0]) { - surf = (IWineD3DSurfaceImpl *) ((IWineD3DTextureImpl *)This->stateBlock->textures[0])->surfaces[0]; - if(surf->CKeyFlags & DDSD_CKSRCBLT) enable_ckey = TRUE; - } - - if (This->stateBlock->renderState[WINED3DRS_ALPHATESTENABLE] || - (This->stateBlock->renderState[WINED3DRS_COLORKEYENABLE] && enable_ckey)) { - glEnable(GL_ALPHA_TEST); - checkGLcall("glEnable GL_ALPHA_TEST"); - } else { - glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable GL_ALPHA_TEST"); - /* Alpha test is disabled, don't bother setting the params - it will happen on the next - * enable call - */ - break; - } - - if(This->stateBlock->renderState[WINED3DRS_COLORKEYENABLE] && enable_ckey) { - glParm = GL_NOTEQUAL; - ref = 0.0; - } else { - ref = ((float) This->stateBlock->renderState[WINED3DRS_ALPHAREF]) / 255.0f; - glParm = CompareFunc(This->stateBlock->renderState[WINED3DRS_ALPHAFUNC]); - } - if(glParm) { - This->alphafunc = glParm; - glAlphaFunc(glParm, ref); - checkGLcall("glAlphaFunc"); - } - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_CLIPPLANEENABLE : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 380f587..02c22b6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -318,6 +318,52 @@ static void state_blend(DWORD state, IWi checkGLcall("glBlendColor"); } +static void state_alpha(DWORD state, IWineD3DStateBlockImpl *stateblock) { + int glParm = 0; + float ref; + BOOL enable_ckey = FALSE; + + IWineD3DSurfaceImpl *surf; + + /* Find out if the texture on the first stage has a ckey set + * The alpha state func reads the texture settings, even though alpha and texture are not grouped + * together. This is to avoid making a huge alpha+texture+texture stage+ckey block due to the hardly + * used WINED3DRS_COLORKEYENABLE state(which is d3d <= 3 only). The texture function will call alpha + * in case it finds some texture+colorkeyenable combination which needs extra care. + */ + if(stateblock->textures[0]) { + surf = (IWineD3DSurfaceImpl *) ((IWineD3DTextureImpl *)stateblock->textures[0])->surfaces[0]; + if(surf->CKeyFlags & DDSD_CKSRCBLT) enable_ckey = TRUE; + } + + if (stateblock->renderState[WINED3DRS_ALPHATESTENABLE] || + (stateblock->renderState[WINED3DRS_COLORKEYENABLE] && enable_ckey)) { + glEnable(GL_ALPHA_TEST); + checkGLcall("glEnable GL_ALPHA_TEST"); + } else { + glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable GL_ALPHA_TEST"); + /* Alpha test is disabled, don't bother setting the params - it will happen on the next + * enable call + */ + return; + } + + if(stateblock->renderState[WINED3DRS_COLORKEYENABLE] && enable_ckey) { + glParm = GL_NOTEQUAL; + ref = 0.0; + } else { + ref = ((float) stateblock->renderState[WINED3DRS_ALPHAREF]) / 255.0f; + glParm = CompareFunc(stateblock->renderState[WINED3DRS_ALPHAFUNC]); + } + if(glParm) { + stateblock->wineD3DDevice->alphafunc = glParm; /* Remove when state management done */ + glAlphaFunc(glParm, ref); + checkGLcall("glAlphaFunc"); + } + /* TODO: Some texture blending operations seem to affect the alpha test */ +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -336,7 +382,7 @@ const struct StateEntry StateTable[] = { /* 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_zwritenable }, - { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_unknown }, + { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, { /* 16, WINED3DRS_LASTPIXEL */ STATE_RENDER(WINED3DRS_LASTPIXEL), state_unknown }, { /* 17, WINED3DRS_TEXTUREMAG */ 0 /* Handled in ddraw */, state_undefined }, { /* 18, WINED3DRS_TEXTUREMIN */ 0 /* Handled in ddraw */, state_undefined }, @@ -345,8 +391,8 @@ const struct StateEntry StateTable[] = { /* 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_zfunc }, - { /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_unknown }, - { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_unknown }, + { /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, + { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable }, { /* 27, WINED3DRS_ALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }, { /* 28, WINED3DRS_FOGENABLE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_unknown }, @@ -362,7 +408,7 @@ const struct StateEntry StateTable[] = { /* 38, WINED3DRS_FOGDENSITY */ STATE_RENDER(WINED3DRS_FOGDENSITY), state_unknown }, { /* 39, WINED3DRS_STIPPLEENABLE */ STATE_RENDER(WINED3DRS_STIPPLEENABLE), state_unknown }, { /* 40, WINED3DRS_EDGEANTIALIAS */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }, - { /* 41, WINED3DRS_COLORKEYENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_unknown }, + { /* 41, WINED3DRS_COLORKEYENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, { /* 42, undefined */ 0, state_undefined }, { /* 43, WINED3DRS_BORDERCOLOR */ STATE_RENDER(WINED3DRS_BORDERCOLOR), state_unknown }, { /* 44, WINED3DRS_TEXTUREADDRESSU */ 0, /* Handled in ddraw */ state_undefined },

1 0

Stefan Dösinger : wined3d: Implement IWineD3DDevice:: Reset.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: d30f1527ccbc4a1910295e947d12a348c1ed0027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30f1527ccbc4a1910295e947… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 16:13:15 2006 +0100 wined3d: Implement IWineD3DDevice::Reset. --- dlls/d3d9/tests/device.c | 145 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 154 ++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 294 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d30f1527ccbc4a1910295…

1 0

Andrew Talbot : mapi32/tests: Cast-qual warnings fix.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: ccf078c1189f7ef56c1a481007d12b19d46f0fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccf078c1189f7ef56c1a48100… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Dec 9 18:05:56 2006 +0000 mapi32/tests: Cast-qual warnings fix. --- dlls/mapi32/tests/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index fd842c3..b2d156b 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -75,7 +75,7 @@ static void test_SwapPlong(void) static void test_HexFromBin(void) { - static const char res[] = { "000102030405060708090A0B0C0D0E0F101112131415161" + static char res[] = { "000102030405060708090A0B0C0D0E0F101112131415161" "718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B" "3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F6" "06162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F8081828384"

1 0

Andrew Talbot : gdi32/tests: Cast-qual warning fix.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: eef087cba7b982c27fcb6503777cd07cbe20476f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef087cba7b982c27fcb65037… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Dec 9 18:03:09 2006 +0000 gdi32/tests: Cast-qual warning fix. --- dlls/gdi32/tests/metafile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index a5261d3..a1481c3 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -280,7 +280,7 @@ static int CALLBACK savedc_emf_enum_proc case EMR_RESTOREDC: { - EMRRESTOREDC *restoredc = (EMRRESTOREDC *)emr; + const EMRRESTOREDC *restoredc = (const EMRRESTOREDC *)emr; switch(++restore_no) { case 1:

1 0

Andrew Talbot : mapi32/tests: Cast-qual warnings fix.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 70fec9058d46c1eb361e443a391127f5371816bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=70fec9058d46c1eb361e443a3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Dec 9 18:05:04 2006 +0000 mapi32/tests: Cast-qual warnings fix. --- dlls/mapi32/tests/prop.c | 74 +++++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 4d874b8..3ffd015 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -81,8 +81,8 @@ static inline int strcmpW(const WCHAR *s static void test_PropCopyMore(void) { - static const char *szHiA = "Hi!"; - static const WCHAR szHiW[] = { 'H', 'i', '!', '\0' }; + static char szHiA[] = "Hi!"; + static WCHAR szHiW[] = { 'H', 'i', '!', '\0' }; SPropValue *lpDest = NULL, *lpSrc = NULL; ULONG i; SCODE scode; @@ -107,10 +107,10 @@ static void test_PropCopyMore(void) switch (ptTypes[i]) { case PT_STRING8: - lpSrc->Value.lpszA = (char*)szHiA; + lpSrc->Value.lpszA = szHiA; break; case PT_UNICODE: - lpSrc->Value.lpszW = (WCHAR*)szHiW; + lpSrc->Value.lpszW = szHiW; break; case PT_BINARY: lpSrc->Value.bin.cb = 4; @@ -151,8 +151,8 @@ static void test_PropCopyMore(void) static void test_UlPropSize(void) { - static const char *szHiA = "Hi!"; - static const WCHAR szHiW[] = { 'H', 'i', '!', '\0' }; + static char szHiA[] = "Hi!"; + static WCHAR szHiW[] = { 'H', 'i', '!', '\0' }; LPSTR buffa[2]; LPWSTR buffw[2]; SBinary buffbin[2]; @@ -202,11 +202,11 @@ static void test_UlPropSize(void) #endif case PT_CLSID: exp *= sizeof(GUID); break; case PT_STRING8: - pv.Value.lpszA = (LPSTR)szHiA; + pv.Value.lpszA = szHiA; exp = 4; break; case PT_UNICODE: - pv.Value.lpszW = (LPWSTR)szHiW; + pv.Value.lpszW = szHiW; exp = 4 * sizeof(WCHAR); break; case PT_BINARY: @@ -215,15 +215,15 @@ static void test_UlPropSize(void) case PT_MV_STRING8: pv.Value.MVszA.cValues = 2; pv.Value.MVszA.lppszA = buffa; - buffa[0] = (LPSTR)szHiA; - buffa[1] = (LPSTR)szHiA; + buffa[0] = szHiA; + buffa[1] = szHiA; exp = 8; break; case PT_MV_UNICODE: pv.Value.MVszW.cValues = 2; pv.Value.MVszW.lppszW = buffw; - buffw[0] = (LPWSTR)szHiW; - buffw[1] = (LPWSTR)szHiW; + buffw[0] = szHiW; + buffw[1] = szHiW; exp = 8 * sizeof(WCHAR); break; case PT_MV_BINARY: @@ -244,12 +244,12 @@ static void test_UlPropSize(void) static void test_FPropContainsProp(void) { - static const char *szFull = "Full String"; - static const char *szFullLower = "full string"; - static const char *szPrefix = "Full"; - static const char *szPrefixLower = "full"; - static const char *szSubstring = "ll St"; - static const char *szSubstringLower = "ll st"; + static char szFull[] = "Full String"; + static char szFullLower[] = "full string"; + static char szPrefix[] = "Full"; + static char szPrefixLower[] = "full"; + static char szSubstring[] = "ll St"; + static char szSubstringLower[] = "ll st"; SPropValue pvLeft, pvRight; ULONG pt; BOOL bRet; @@ -275,19 +275,19 @@ static void test_FPropContainsProp(void) /* test the various flag combinations */ pvLeft.ulPropTag = pvRight.ulPropTag = PT_STRING8; - pvLeft.Value.lpszA = (LPSTR)szFull; - pvRight.Value.lpszA = (LPSTR)szFull; + pvLeft.Value.lpszA = szFull; + pvRight.Value.lpszA = szFull; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); ok(bRet == TRUE, "(full,full)[] match failed\n"); - pvRight.Value.lpszA = (LPSTR)szPrefix; + pvRight.Value.lpszA = szPrefix; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); ok(bRet == FALSE, "(full,prefix)[] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == TRUE, "(full,prefix)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); ok(bRet == TRUE, "(full,prefix)[SUBSTRING] match failed\n"); - pvRight.Value.lpszA = (LPSTR)szPrefixLower; + pvRight.Value.lpszA = szPrefixLower; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == FALSE, "(full,prefixlow)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); @@ -296,14 +296,14 @@ static void test_FPropContainsProp(void) ok(bRet == TRUE, "(full,prefixlow)[PREFIX|IGNORECASE] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING|FL_IGNORECASE); ok(bRet == TRUE, "(full,prefixlow)[SUBSTRING|IGNORECASE] match failed\n"); - pvRight.Value.lpszA = (LPSTR)szSubstring; + pvRight.Value.lpszA = szSubstring; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); ok(bRet == FALSE, "(full,substr)[] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == FALSE, "(full,substr)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); ok(bRet == TRUE, "(full,substr)[SUBSTRING] match failed\n"); - pvRight.Value.lpszA = (LPSTR)szSubstringLower; + pvRight.Value.lpszA = szSubstringLower; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == FALSE, "(full,substrlow)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); @@ -312,7 +312,7 @@ static void test_FPropContainsProp(void) ok(bRet == FALSE, "(full,substrlow)[PREFIX|IGNORECASE] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING|FL_IGNORECASE); ok(bRet == TRUE, "(full,substrlow)[SUBSTRING|IGNORECASE] match failed\n"); - pvRight.Value.lpszA = (LPSTR)szFullLower; + pvRight.Value.lpszA = szFullLower; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING|FL_IGNORECASE); ok(bRet == TRUE, "(full,fulllow)[IGNORECASE] match failed\n"); @@ -662,8 +662,8 @@ static void test_PpropFindProp(void) static void test_ScCountProps(void) { - static const char *szHiA = "Hi!"; - static const WCHAR szHiW[] = { 'H', 'i', '!', '\0' }; + static char szHiA[] = "Hi!"; + static WCHAR szHiW[] = { 'H', 'i', '!', '\0' }; static const ULONG ULHILEN = 4; /* chars in szHiA/W incl. NUL */ LPSTR buffa[3]; LPWSTR buffw[3]; @@ -705,11 +705,11 @@ static void test_ScCountProps(void) exp = sizeof(GUID) + sizeof(pv); break; case PT_STRING8: - pv.Value.lpszA = (LPSTR)szHiA; + pv.Value.lpszA = szHiA; exp = 4 + sizeof(pv); break; case PT_UNICODE: - pv.Value.lpszW = (LPWSTR)szHiW; + pv.Value.lpszW = szHiW; exp = 4 * sizeof(WCHAR) + sizeof(pv); break; case PT_BINARY: @@ -756,17 +756,17 @@ static void test_ScCountProps(void) case PT_MV_STRING8: pv.Value.MVszA.cValues = 3; pv.Value.MVszA.lppszA = buffa; - buffa[0] = (LPSTR)szHiA; - buffa[1] = (LPSTR)szHiA; - buffa[2] = (LPSTR)szHiA; + buffa[0] = szHiA; + buffa[1] = szHiA; + buffa[2] = szHiA; exp = ULHILEN * 3 + 3 * sizeof(char*) + sizeof(pv); break; case PT_MV_UNICODE: pv.Value.MVszW.cValues = 3; pv.Value.MVszW.lppszW = buffw; - buffw[0] = (LPWSTR)szHiW; - buffw[1] = (LPWSTR)szHiW; - buffw[2] = (LPWSTR)szHiW; + buffw[0] = szHiW; + buffw[1] = szHiW; + buffw[2] = szHiW; exp = ULHILEN * 3 * sizeof(WCHAR) + 3 * sizeof(WCHAR*) + sizeof(pv); break; case PT_MV_BINARY: @@ -802,7 +802,7 @@ static void test_ScCountProps(void) static void test_ScCopyRelocProps(void) { - static const char* szTestA = "Test"; + static char szTestA[] = "Test"; char buffer[512], buffer2[512], *lppszA[1]; SPropValue pvProp, *lpResProp = (LPSPropValue)buffer; ULONG ulCount; @@ -816,7 +816,7 @@ static void test_ScCopyRelocProps(void) pvProp.ulPropTag = PROP_TAG(PT_MV_STRING8, 1u); - lppszA[0] = (char *)szTestA; + lppszA[0] = szTestA; pvProp.Value.MVszA.cValues = 1; pvProp.Value.MVszA.lppszA = lppszA; ulCount = 0;

1 0

Peter Oberndorfer : comctl32: Fix imagelist regression from "comctl32: Remove Nx1 assumptions in ImageList_Read".
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: d119fd44fec30ff605af6498a88a8ac0372feb32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d119fd44fec30ff605af6498a… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Sun Dec 10 16:57:06 2006 +0100 comctl32: Fix imagelist regression from "comctl32: Remove Nx1 assumptions in ImageList_Read". --- dlls/comctl32/imagelist.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 18a88c5..f14149b 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1980,7 +1980,6 @@ HIMAGELIST WINAPI ImageList_Read (LPSTRE { ILHEAD ilHead; HIMAGELIST himl; - HBITMAP hbmColor=0; int i; TRACE("%p\n", pstm); @@ -1994,7 +1993,6 @@ HIMAGELIST WINAPI ImageList_Read (LPSTRE himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); if (!himl) { - DeleteObject(hbmColor); return NULL; } if (!_read_bitmap(himl, himl->hdcImage, pstm, ilHead.flags & ~ILC_MASK)) { @@ -2003,14 +2001,10 @@ HIMAGELIST WINAPI ImageList_Read (LPSTRE } if (ilHead.flags & ILC_MASK) { if (!_read_bitmap(himl, himl->hdcMask, pstm, 0)) { - DeleteObject(hbmColor); return NULL; } } - SelectObject(himl->hdcImage, hbmColor); - DeleteObject(himl->hbmImage); - himl->hbmImage = hbmColor; himl->cCurImage = ilHead.cCurImage; himl->cMaxImage = ilHead.cMaxImage;

1 0

Chris Robinson : wined3d: Reduce the number of error messages.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 36be22a6db65be3dd1260a0de7f62de06cde623c URL: http://source.winehq.org/git/wine.git/?a=commit;h=36be22a6db65be3dd1260a0de… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Dec 10 06:04:29 2006 -0800 wined3d: Reduce the number of error messages. --- dlls/wined3d/directx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 59f8c83..b099c2d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1391,7 +1391,6 @@ static BOOL IWineD3DImpl_IsGLXFBConfigCo if (type & GLX_COLOR_INDEX_BIT && 8 == buf_sz) return TRUE; break; default: - ERR("unsupported format %s\n", debug_d3dformat(Format)); break; } return FALSE; @@ -1409,7 +1408,6 @@ switch (Format) { case WINED3DFMT_P8: return TRUE; default: - ERR("unsupported format %s\n", debug_d3dformat(Format)); break; } return FALSE; @@ -1451,7 +1449,6 @@ static BOOL IWineD3DImpl_IsGLXFBConfigCo if (32 == db) return TRUE; break; default: - ERR("unsupported format %s\n", debug_d3dformat(Format)); break; } return FALSE; @@ -1468,7 +1465,6 @@ static BOOL IWineD3DImpl_IsGLXFBConfigCo case WINED3DFMT_D32F_LOCKABLE: return TRUE; default: - ERR("unsupported format %s\n", debug_d3dformat(Format)); break; } return FALSE; @@ -1510,6 +1506,8 @@ static HRESULT WINAPI IWineD3DImpl_Check } } XFree(cfgs); + if(hr != WINED3D_OK) + ERR("unsupported format pair: %s and %s\n", debug_d3dformat(RenderTargetFormat), debug_d3dformat(DepthStencilFormat)); } else { ERR_(d3d_caps)("returning WINED3D_OK even so CreateFakeGLContext or glXGetFBConfigs failed\n"); hr = WINED3D_OK; @@ -1587,6 +1585,8 @@ static HRESULT WINAPI IWineD3DImpl_Check } } if(cfgs) XFree(cfgs); + if(hr != WINED3D_OK) + ERR("unsupported format %s\n", debug_d3dformat(DisplayFormat)); WineD3D_ReleaseFakeGLContext(); }

1 0