February 2007 - Wine-Commits

H. Verbeet : wined3d: Add WINED3DPBLENDCAPS flags and use them.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: 748fd83ebde3c0d0f1b5b5779aeba1a3b1b81f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=748fd83ebde3c0d0f1b5b5779… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Feb 15 09:22:16 2007 +0100 wined3d: Add WINED3DPBLENDCAPS flags and use them. --- dlls/wined3d/directx.c | 58 +++++++++++++++++++++--------------------- include/wine/wined3d_caps.h | 15 +++++++++++ 2 files changed, 44 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cf83435..817fdf9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1939,35 +1939,35 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, D3DPCMPCAPS_NEVER | D3DPCMPCAPS_NOTEQUAL; - *pCaps->SrcBlendCaps = D3DPBLENDCAPS_BLENDFACTOR | - D3DPBLENDCAPS_BOTHINVSRCALPHA | - D3DPBLENDCAPS_BOTHSRCALPHA | - D3DPBLENDCAPS_DESTALPHA | - D3DPBLENDCAPS_DESTCOLOR | - D3DPBLENDCAPS_INVDESTALPHA | - D3DPBLENDCAPS_INVDESTCOLOR | - D3DPBLENDCAPS_INVSRCALPHA | - D3DPBLENDCAPS_INVSRCCOLOR | - D3DPBLENDCAPS_ONE | - D3DPBLENDCAPS_SRCALPHA | - D3DPBLENDCAPS_SRCALPHASAT | - D3DPBLENDCAPS_SRCCOLOR | - D3DPBLENDCAPS_ZERO; - - *pCaps->DestBlendCaps = D3DPBLENDCAPS_BLENDFACTOR | - D3DPBLENDCAPS_BOTHINVSRCALPHA | - D3DPBLENDCAPS_BOTHSRCALPHA | - D3DPBLENDCAPS_DESTALPHA | - D3DPBLENDCAPS_DESTCOLOR | - D3DPBLENDCAPS_INVDESTALPHA | - D3DPBLENDCAPS_INVDESTCOLOR | - D3DPBLENDCAPS_INVSRCALPHA | - D3DPBLENDCAPS_INVSRCCOLOR | - D3DPBLENDCAPS_ONE | - D3DPBLENDCAPS_SRCALPHA | - D3DPBLENDCAPS_SRCALPHASAT | - D3DPBLENDCAPS_SRCCOLOR | - D3DPBLENDCAPS_ZERO; + *pCaps->SrcBlendCaps = WINED3DPBLENDCAPS_BLENDFACTOR | + WINED3DPBLENDCAPS_BOTHINVSRCALPHA | + WINED3DPBLENDCAPS_BOTHSRCALPHA | + WINED3DPBLENDCAPS_DESTALPHA | + WINED3DPBLENDCAPS_DESTCOLOR | + WINED3DPBLENDCAPS_INVDESTALPHA | + WINED3DPBLENDCAPS_INVDESTCOLOR | + WINED3DPBLENDCAPS_INVSRCALPHA | + WINED3DPBLENDCAPS_INVSRCCOLOR | + WINED3DPBLENDCAPS_ONE | + WINED3DPBLENDCAPS_SRCALPHA | + WINED3DPBLENDCAPS_SRCALPHASAT | + WINED3DPBLENDCAPS_SRCCOLOR | + WINED3DPBLENDCAPS_ZERO; + + *pCaps->DestBlendCaps = WINED3DPBLENDCAPS_BLENDFACTOR | + WINED3DPBLENDCAPS_BOTHINVSRCALPHA | + WINED3DPBLENDCAPS_BOTHSRCALPHA | + WINED3DPBLENDCAPS_DESTALPHA | + WINED3DPBLENDCAPS_DESTCOLOR | + WINED3DPBLENDCAPS_INVDESTALPHA | + WINED3DPBLENDCAPS_INVDESTCOLOR | + WINED3DPBLENDCAPS_INVSRCALPHA | + WINED3DPBLENDCAPS_INVSRCCOLOR | + WINED3DPBLENDCAPS_ONE | + WINED3DPBLENDCAPS_SRCALPHA | + WINED3DPBLENDCAPS_SRCALPHASAT | + WINED3DPBLENDCAPS_SRCCOLOR | + WINED3DPBLENDCAPS_ZERO; *pCaps->AlphaCmpCaps = D3DPCMPCAPS_ALWAYS | D3DPCMPCAPS_EQUAL | diff --git a/include/wine/wined3d_caps.h b/include/wine/wined3d_caps.h index 92f16b6..1cedae7 100644 --- a/include/wine/wined3d_caps.h +++ b/include/wine/wined3d_caps.h @@ -19,6 +19,21 @@ #ifndef __WINE_WINED3D_CAPS_H #define __WINE_WINED3D_CAPS_H +#define WINED3DPBLENDCAPS_ZERO 0x00000001 +#define WINED3DPBLENDCAPS_ONE 0x00000002 +#define WINED3DPBLENDCAPS_SRCCOLOR 0x00000004 +#define WINED3DPBLENDCAPS_INVSRCCOLOR 0x00000008 +#define WINED3DPBLENDCAPS_SRCALPHA 0x00000010 +#define WINED3DPBLENDCAPS_INVSRCALPHA 0x00000020 +#define WINED3DPBLENDCAPS_DESTALPHA 0x00000040 +#define WINED3DPBLENDCAPS_INVDESTALPHA 0x00000080 +#define WINED3DPBLENDCAPS_DESTCOLOR 0x00000100 +#define WINED3DPBLENDCAPS_INVDESTCOLOR 0x00000200 +#define WINED3DPBLENDCAPS_SRCALPHASAT 0x00000400 +#define WINED3DPBLENDCAPS_BOTHSRCALPHA 0x00000800 +#define WINED3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000 +#define WINED3DPBLENDCAPS_BLENDFACTOR 0x00002000 + #define WINED3DSTENCILCAPS_KEEP 0x00000001 #define WINED3DSTENCILCAPS_ZERO 0x00000002 #define WINED3DSTENCILCAPS_REPLACE 0x00000004

1 0

H. Verbeet : wined3d: Add WINED3DSTENCILCAPS flags and use them.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: 8fdd88b42ce27437c8247f4f5993dd1dc4da8cb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fdd88b42ce27437c8247f4f5… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Feb 14 23:30:53 2007 +0100 wined3d: Add WINED3DSTENCILCAPS flags and use them. --- dlls/wined3d/directx.c | 18 +++++++++--------- include/wine/wined3d_caps.h | 10 ++++++++++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c2e8522..cf83435 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2119,20 +2119,20 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->ExtentsAdjust = 0; - *pCaps->StencilCaps = D3DSTENCILCAPS_DECRSAT | - D3DSTENCILCAPS_INCRSAT | - D3DSTENCILCAPS_INVERT | - D3DSTENCILCAPS_KEEP | - D3DSTENCILCAPS_REPLACE | - D3DSTENCILCAPS_ZERO; + *pCaps->StencilCaps = WINED3DSTENCILCAPS_DECRSAT | + WINED3DSTENCILCAPS_INCRSAT | + WINED3DSTENCILCAPS_INVERT | + WINED3DSTENCILCAPS_KEEP | + WINED3DSTENCILCAPS_REPLACE | + WINED3DSTENCILCAPS_ZERO; if (GL_SUPPORT(EXT_STENCIL_WRAP)) { - *pCaps->StencilCaps |= D3DSTENCILCAPS_DECR | - D3DSTENCILCAPS_INCR; + *pCaps->StencilCaps |= WINED3DSTENCILCAPS_DECR | + WINED3DSTENCILCAPS_INCR; } if ( This->dxVersion > 8 && ( GL_SUPPORT(EXT_STENCIL_TWO_SIDE) || GL_SUPPORT(ATI_SEPARATE_STENCIL) ) ) { - *pCaps->StencilCaps |= D3DSTENCILCAPS_TWOSIDED; + *pCaps->StencilCaps |= WINED3DSTENCILCAPS_TWOSIDED; } *pCaps->FVFCaps = D3DFVFCAPS_PSIZE | 0x0008; /* 8 texture coords */ diff --git a/include/wine/wined3d_caps.h b/include/wine/wined3d_caps.h index 4bf474b..92f16b6 100644 --- a/include/wine/wined3d_caps.h +++ b/include/wine/wined3d_caps.h @@ -19,6 +19,16 @@ #ifndef __WINE_WINED3D_CAPS_H #define __WINE_WINED3D_CAPS_H +#define WINED3DSTENCILCAPS_KEEP 0x00000001 +#define WINED3DSTENCILCAPS_ZERO 0x00000002 +#define WINED3DSTENCILCAPS_REPLACE 0x00000004 +#define WINED3DSTENCILCAPS_INCRSAT 0x00000008 +#define WINED3DSTENCILCAPS_DECRSAT 0x00000010 +#define WINED3DSTENCILCAPS_INVERT 0x00000020 +#define WINED3DSTENCILCAPS_INCR 0x00000040 +#define WINED3DSTENCILCAPS_DECR 0x00000080 +#define WINED3DSTENCILCAPS_TWOSIDED 0x00000100 + #define WINED3DTEXOPCAPS_DISABLE 0x00000001 #define WINED3DTEXOPCAPS_SELECTARG1 0x00000002 #define WINED3DTEXOPCAPS_SELECTARG2 0x00000004

1 0

H. Verbeet : wined3d: Add WINED3DTEXOPCAPS flags and use them.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: ea683407af76935fe626a04e200f09cbe31c587c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea683407af76935fe626a04e2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Feb 14 23:30:46 2007 +0100 wined3d: Add WINED3DTEXOPCAPS flags and use them. --- dlls/wined3d/directx.c | 56 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_caps.h | 49 +++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 398aca0..c2e8522 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2137,48 +2137,48 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->FVFCaps = D3DFVFCAPS_PSIZE | 0x0008; /* 8 texture coords */ - *pCaps->TextureOpCaps = D3DTEXOPCAPS_ADD | - D3DTEXOPCAPS_ADDSIGNED | - D3DTEXOPCAPS_ADDSIGNED2X | - D3DTEXOPCAPS_MODULATE | - D3DTEXOPCAPS_MODULATE2X | - D3DTEXOPCAPS_MODULATE4X | - D3DTEXOPCAPS_SELECTARG1 | - D3DTEXOPCAPS_SELECTARG2 | - D3DTEXOPCAPS_DISABLE; + *pCaps->TextureOpCaps = WINED3DTEXOPCAPS_ADD | + WINED3DTEXOPCAPS_ADDSIGNED | + WINED3DTEXOPCAPS_ADDSIGNED2X | + WINED3DTEXOPCAPS_MODULATE | + WINED3DTEXOPCAPS_MODULATE2X | + WINED3DTEXOPCAPS_MODULATE4X | + WINED3DTEXOPCAPS_SELECTARG1 | + WINED3DTEXOPCAPS_SELECTARG2 | + WINED3DTEXOPCAPS_DISABLE; if (GL_SUPPORT(ARB_TEXTURE_ENV_COMBINE) || GL_SUPPORT(EXT_TEXTURE_ENV_COMBINE) || GL_SUPPORT(NV_TEXTURE_ENV_COMBINE4)) { - *pCaps->TextureOpCaps |= D3DTEXOPCAPS_BLENDDIFFUSEALPHA | - D3DTEXOPCAPS_BLENDTEXTUREALPHA | - D3DTEXOPCAPS_BLENDFACTORALPHA | - D3DTEXOPCAPS_BLENDCURRENTALPHA | - D3DTEXOPCAPS_LERP | - D3DTEXOPCAPS_SUBTRACT; + *pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_BLENDDIFFUSEALPHA | + WINED3DTEXOPCAPS_BLENDTEXTUREALPHA | + WINED3DTEXOPCAPS_BLENDFACTORALPHA | + WINED3DTEXOPCAPS_BLENDCURRENTALPHA | + WINED3DTEXOPCAPS_LERP | + WINED3DTEXOPCAPS_SUBTRACT; } if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3) || GL_SUPPORT(NV_TEXTURE_ENV_COMBINE4)) { - *pCaps->TextureOpCaps |= D3DTEXOPCAPS_ADDSMOOTH | - D3DTEXOPCAPS_MULTIPLYADD | - D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR | - D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA | - D3DTEXOPCAPS_BLENDTEXTUREALPHAPM; + *pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_ADDSMOOTH | + WINED3DTEXOPCAPS_MULTIPLYADD | + WINED3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR | + WINED3DTEXOPCAPS_MODULATECOLOR_ADDALPHA | + WINED3DTEXOPCAPS_BLENDTEXTUREALPHAPM; } if (GL_SUPPORT(ARB_TEXTURE_ENV_DOT3)) - *pCaps->TextureOpCaps |= D3DTEXOPCAPS_DOTPRODUCT3; + *pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_DOTPRODUCT3; if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { - *pCaps->TextureOpCaps |= D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR | - D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA; + *pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR | + WINED3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA; } - - + + #if 0 - *pCaps->TextureOpCaps |= D3DTEXOPCAPS_BUMPENVMAP; + *pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_BUMPENVMAP; /* FIXME: Add - D3DTEXOPCAPS_BUMPENVMAPLUMINANCE - D3DTEXOPCAPS_PREMODULATE */ + WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE + WINED3DTEXOPCAPS_PREMODULATE */ #endif *pCaps->MaxTextureBlendStages = GL_LIMITS(texture_stages); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d32d8de..c20532e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -41,6 +41,7 @@ #include "wined3d_private_types.h" #include "ddraw.h" #include "wine/wined3d_interface.h" +#include "wine/wined3d_caps.h" #include "wine/wined3d_gl.h" #include "wine/list.h" diff --git a/include/wine/wined3d_caps.h b/include/wine/wined3d_caps.h new file mode 100644 index 0000000..4bf474b --- /dev/null +++ b/include/wine/wined3d_caps.h @@ -0,0 +1,49 @@ +/* + * Copyright 2007 Henri Verbeet + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINED3D_CAPS_H +#define __WINE_WINED3D_CAPS_H + +#define WINED3DTEXOPCAPS_DISABLE 0x00000001 +#define WINED3DTEXOPCAPS_SELECTARG1 0x00000002 +#define WINED3DTEXOPCAPS_SELECTARG2 0x00000004 +#define WINED3DTEXOPCAPS_MODULATE 0x00000008 +#define WINED3DTEXOPCAPS_MODULATE2X 0x00000010 +#define WINED3DTEXOPCAPS_MODULATE4X 0x00000020 +#define WINED3DTEXOPCAPS_ADD 0x00000040 +#define WINED3DTEXOPCAPS_ADDSIGNED 0x00000080 +#define WINED3DTEXOPCAPS_ADDSIGNED2X 0x00000100 +#define WINED3DTEXOPCAPS_SUBTRACT 0x00000200 +#define WINED3DTEXOPCAPS_ADDSMOOTH 0x00000400 +#define WINED3DTEXOPCAPS_BLENDDIFFUSEALPHA 0x00000800 +#define WINED3DTEXOPCAPS_BLENDTEXTUREALPHA 0x00001000 +#define WINED3DTEXOPCAPS_BLENDFACTORALPHA 0x00002000 +#define WINED3DTEXOPCAPS_BLENDTEXTUREALPHAPM 0x00004000 +#define WINED3DTEXOPCAPS_BLENDCURRENTALPHA 0x00008000 +#define WINED3DTEXOPCAPS_PREMODULATE 0x00010000 +#define WINED3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR 0x00020000 +#define WINED3DTEXOPCAPS_MODULATECOLOR_ADDALPHA 0x00040000 +#define WINED3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR 0x00080000 +#define WINED3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA 0x00100000 +#define WINED3DTEXOPCAPS_BUMPENVMAP 0x00200000 +#define WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE 0x00400000 +#define WINED3DTEXOPCAPS_DOTPRODUCT3 0x00800000 +#define WINED3DTEXOPCAPS_MULTIPLYADD 0x01000000 +#define WINED3DTEXOPCAPS_LERP 0x02000000 + +#endif /* __WINE_WINED3D_CAPS_H */

1 0

Stefan Dösinger : wined3d: Restore blitting environment after modifying it.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: 1282b433020674081ebf75b128180bf61e236b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1282b433020674081ebf75b12… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 03:04:40 2007 +0100 wined3d: Restore blitting environment after modifying it. --- dlls/wined3d/surface.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 093af9e..b8acb89 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -964,6 +964,12 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This) { vcheckGLcall("glPixelStorei GL_PACK_SWAP_BYTES"); } + /* Blitting environment requires that 2D texturing is enabled. It was turned off before, + * turn it on again + */ + glEnable(GL_TEXTURE_2D); + checkGLcall("glEnable(GL_TEXTURE_2D)"); + if(memory_allocated) HeapFree(GetProcessHeap(), 0, mem); return; } @@ -2639,6 +2645,11 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * glEnd(); checkGLcall("glEnd"); + if(Flags & (DDBLT_KEYSRC | DDBLT_KEYSRCOVERRIDE)) { + glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable(GL_ALPHA_TEST)"); + } + /* Unbind the texture */ glBindTexture(GL_TEXTURE_2D, 0); checkGLcall("glEnable glBindTexture");

1 0

Stefan Dösinger : wined3d: alphaop fixes for color keying.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: b3f96f43276f34a9e3c0403839e565915280aa64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f96f43276f34a9e3c040383… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 03:04:18 2007 +0100 wined3d: alphaop fixes for color keying. --- dlls/wined3d/state.c | 45 ++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e437136..560b60e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -352,6 +352,11 @@ static void state_alpha(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D } } + if(enable_ckey || context->last_was_ckey) { + StateTable[STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP)].apply(STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), stateblock, context); + } + context->last_was_ckey = enable_ckey; + if (stateblock->renderState[WINED3DRS_ALPHATESTENABLE] || (stateblock->renderState[WINED3DRS_COLORKEYENABLE] && enable_ckey)) { glEnable(GL_ALPHA_TEST); @@ -376,7 +381,6 @@ static void state_alpha(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D glAlphaFunc(glParm, ref); checkGLcall("glAlphaFunc"); } - /* TODO: Some texture blending operations seem to affect the alpha test */ } static void state_clipping(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { @@ -1521,6 +1525,7 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D static void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage]; + DWORD op, arg1, arg2, arg0; TRACE("Setting alpha op for stage %d\n", stage); /* Do not care for enabled / disabled stages, just assign the settigns. colorop disables / enables required stuff */ @@ -1542,19 +1547,41 @@ static void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D } } + op = stateblock->textureState[stage][WINED3DTSS_ALPHAOP]; + arg1 = stateblock->textureState[stage][WINED3DTSS_ALPHAARG1]; + arg2 = stateblock->textureState[stage][WINED3DTSS_ALPHAARG2]; + arg0 = stateblock->textureState[stage][WINED3DTSS_ALPHAARG0]; + + if(stateblock->renderState[WINED3DRS_COLORKEYENABLE] && stage == 0 && + stateblock->textures[0] && stateblock->textureDimensions[0] == GL_TEXTURE_2D) { + IWineD3DSurfaceImpl *surf = (IWineD3DSurfaceImpl *) ((IWineD3DTextureImpl *) stateblock->textures[0])->surfaces[0]; + + if(surf->CKeyFlags & DDSD_CKSRCBLT && + getFormatDescEntry(surf->resource.format)->alphaMask == 0x00000000) { + + /* Color keying needs to pass alpha values from the texture through to have the alpha test work properly. + * On the other hand applications can still use texture combiners apparently. This code takes care that apps + * cannot remove the texture's alpha channel entirely. + * + * The fixup is required for Prince of Persia 3D(prison bars), while Moto racer 2 requires D3DTOP_MODULATE to work + * on color keyed surfaces. + * + * What to do with multitexturing? So far no app has been found that uses color keying with multitexturing + */ + if(op == WINED3DTOP_DISABLE) op = WINED3DTOP_SELECTARG1; + if(op == WINED3DTOP_SELECTARG1) arg1 = WINED3DTA_TEXTURE; + else if(op == WINED3DTOP_SELECTARG2) arg2 = WINED3DTA_TEXTURE; + } + } + TRACE("Setting alpha op for stage %d\n", stage); if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { set_tex_op_nvrc((IWineD3DDevice *)stateblock->wineD3DDevice, TRUE, stage, - stateblock->textureState[stage][WINED3DTSS_ALPHAOP], - stateblock->textureState[stage][WINED3DTSS_ALPHAARG1], - stateblock->textureState[stage][WINED3DTSS_ALPHAARG2], - stateblock->textureState[stage][WINED3DTSS_ALPHAARG0], + op, arg1, arg2, arg0, mapped_stage); } else { - set_tex_op((IWineD3DDevice *)stateblock->wineD3DDevice, TRUE, stage, stateblock->textureState[stage][WINED3DTSS_ALPHAOP], - stateblock->textureState[stage][WINED3DTSS_ALPHAARG1], - stateblock->textureState[stage][WINED3DTSS_ALPHAARG2], - stateblock->textureState[stage][WINED3DTSS_ALPHAARG0]); + set_tex_op((IWineD3DDevice *)stateblock->wineD3DDevice, TRUE, stage, + op, arg1, arg2, arg0); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 20c9072..d32d8de 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -478,7 +478,7 @@ struct WineD3DContext { BOOL namedArraysLoaded, numberedArraysLoaded; BOOL lastWasPow2Texture[MAX_TEXTURES]; GLenum tracking_parm; /* Which source is tracking current colour */ - BOOL last_was_blit; + BOOL last_was_blit, last_was_ckey; /* The actual opengl context */ GLXContext glCtx;

1 0

Stefan Dösinger : wined3d: Enable color keying only for surfaces without an alpha channel.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: d4c4e5d167e84321f94050b774bb0792d826f1d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c4e5d167e84321f94050b77… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 03:05:54 2007 +0100 wined3d: Enable color keying only for surfaces without an alpha channel. --- dlls/wined3d/state.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 438f6f0..e437136 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -337,9 +337,19 @@ static void state_alpha(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D * 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]) { + if(stateblock->textures[0] && stateblock->textureDimensions[0] == GL_TEXTURE_2D) { surf = (IWineD3DSurfaceImpl *) ((IWineD3DTextureImpl *)stateblock->textures[0])->surfaces[0]; - if(surf->CKeyFlags & DDSD_CKSRCBLT) enable_ckey = TRUE; + + if(surf->CKeyFlags & DDSD_CKSRCBLT) { + const PixelFormatDesc *fmt = getFormatDescEntry(surf->resource.format); + /* The surface conversion does not do color keying conversion for surfaces that have an alpha + * channel on their own. Likewise, the alpha test shouldn't be set up for color keying if the + * surface has alpha bits + */ + if(fmt->alphaMask == 0x00000000) { + enable_ckey = TRUE; + } + } } if (stateblock->renderState[WINED3DRS_ALPHATESTENABLE] ||

1 0

Stefan Dösinger : ddraw, wined3d: Color keying tests and fixes.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: 8b8e30b1e1a697c07a8c4ca34d4376fcb024e2fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8e30b1e1a697c07a8c4ca34… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 03:03:05 2007 +0100 ddraw, wined3d: Color keying tests and fixes. --- dlls/ddraw/surface.c | 18 +++ dlls/ddraw/tests/dsurface.c | 323 +++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 59 ++++---- dlls/wined3d/surface_gdi.c | 35 +++-- 4 files changed, 394 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b8e30b1e1a697c07a8c4…

1 0

Stefan Dösinger : wined3d: Accelerated blits from and to offscreen render targets.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: ccd2772e288558969b01837419e052eded1e5dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccd2772e288558969b0183741… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 03:02:39 2007 +0100 wined3d: Accelerated blits from and to offscreen render targets. --- dlls/wined3d/surface.c | 581 ++++++++++++++++++++++++------------------------ 1 files changed, 290 insertions(+), 291 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccd2772e288558969b018…

1 0

Stefan Dösinger : wined3d: Convert and load U8V8 surfaces as rgb.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: de036ff68e6adcb4b0f969dcfff3f2a4f2159251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de036ff68e6adcb4b0f969dcf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 03:01:44 2007 +0100 wined3d: Convert and load U8V8 surfaces as rgb. GL_INDEX is definitly not the way to load U8V8 surfaces --- dlls/wined3d/surface.c | 35 ++++++++++++++++++++++++++++++++++- dlls/wined3d/utils.c | 2 +- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 149ec02..dabee6d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -44,7 +44,8 @@ typedef enum { CONVERT_CK_RGB24, CONVERT_CK_8888, CONVERT_CK_8888_ARGB, - CONVERT_RGB32_888 + CONVERT_RGB32_888, + CONVERT_V8U8 } CONVERT_TYPES; HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); @@ -71,6 +72,11 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { int src_pitch = 0; int dst_pitch = 0; + if(This->Flags & SFLAG_CONVERTED) { + FIXME("Read back converted textures unsupported\n"); + return; + } + if (This->Flags & SFLAG_NONPOW2) { src_pitch = This->bytesPerPixel * This->pow2Width; dst_pitch = IWineD3DSurface_GetPitch((IWineD3DSurface *) This); @@ -1405,6 +1411,14 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } break; + case WINED3DFMT_V8U8: + *convert = CONVERT_V8U8; + *format = GL_BGR; + *internal = GL_RGB8; + *type = GL_BYTE; + *target_bpp = 3; + break; + default: break; } @@ -1524,6 +1538,25 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN } break; + case CONVERT_V8U8: + { + unsigned int x, y; + short *Source; + char *Dest; + for(y = 0; y < height; y++) { + Source = (short *) (src + y * pitch); + Dest = (char *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) { + long color = (*Source++); + Dest[0] = color >> 8; + Dest[1] = color; + Dest[2] = 0xff; + Dest += 3; + } + } + break; + } + default: ERR("Unsupported conversation type %d\n", convert); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8c0db1c..849f915 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -82,7 +82,7 @@ static const PixelFormatDesc formats[] = { {WINED3DFMT_A8L8 ,0x0000ff00 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_LUMINANCE8_ALPHA8 ,GL_LUMINANCE_ALPHA ,GL_UNSIGNED_BYTE }, {WINED3DFMT_A4L4 ,0x000000f0 ,0x0 ,0x0 ,0x0 ,1 ,FALSE ,GL_LUMINANCE4_ALPHA4 ,GL_LUMINANCE_ALPHA ,GL_UNSIGNED_BYTE }, /* Bump mapping stuff */ - {WINED3DFMT_V8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_COLOR_INDEX8_EXT ,GL_COLOR_INDEX ,GL_UNSIGNED_BYTE }, + {WINED3DFMT_V8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_RGB8 ,GL_BGR ,GL_BYTE /* needs conversion! */}, {WINED3DFMT_L6V5U5 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_COLOR_INDEX8_EXT ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT_5_5_5_1 }, {WINED3DFMT_X8L8V8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_RGBA8 ,GL_BGRA ,GL_UNSIGNED_BYTE }, {WINED3DFMT_Q8W8V8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_RGBA8 ,GL_RGBA ,GL_UNSIGNED_INT_8_8_8_8_REV/*?*/},

1 0

Stefan Dösinger : wined3d: Implement texbem in arb, improve it in glsl.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: 99576ea24e2dd87be5be147bdfd92ec32c36cd22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99576ea24e2dd87be5be147bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 03:00:57 2007 +0100 wined3d: Implement texbem in arb, improve it in glsl. --- dlls/wined3d/arb_program_shader.c | 53 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/glsl_shader.c | 47 ++++++++++++++++++++++++++++---- 2 files changed, 93 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 86e8430..4742447 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -119,6 +119,15 @@ void shader_arb_load_constants( GL_LIMITS(pshader_constantsF), stateBlock->pixelShaderConstantF, &stateBlock->set_pconstantsF); + if(((IWineD3DPixelShaderImpl *) pshader)->bumpenvmatconst) { + /* needsbumpmat stores the stage number from where to load the matrix. bumpenvmatconst stores the + * number of the constant to load the matrix into. + * The state manager takes care that this function is always called if the bump env matrix changes + */ + IWineD3DPixelShaderImpl *psi = (IWineD3DPixelShaderImpl *) pshader; + float *data = (float *) &stateBlock->textureState[(int) psi->needsbumpmat][WINED3DTSS_BUMPENVMAT00]; + GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, psi->bumpenvmatconst, data)); + } } } @@ -159,6 +168,19 @@ void shader_generate_arb_declarations( shader_addline(buffer, "MOV T%u, fragment.texcoord[%u];\n", i, i); } + if(reg_maps->bumpmat /* Only a pshader can use texbem */) { + /* If the shader does not use all available constants, use the next free constant to load the bump mapping environment matrix from + * the stateblock into the shader. If no constant is available don't load, texbem will then just sample the texture without applying + * bump mapping. + */ + if(max_constantsF < GL_LIMITS(pshader_constantsF)) { + ((IWineD3DPixelShaderImpl *)This)->bumpenvmatconst = max_constantsF; + shader_addline(buffer, "PARAM bumpenvmat = program.env[%d];\n", ((IWineD3DPixelShaderImpl *)This)->bumpenvmatconst); + } else { + FIXME("No free constant found to load environemnt bump mapping matrix into the shader. texbem instruction will not apply bump mapping\n"); + } + } + /* Need to PARAM the environment parameters (constants) so we can use relative addressing */ shader_addline(buffer, "PARAM C[%d] = { program.env[0..%d] };\n", max_constantsF, max_constantsF - 1); @@ -662,7 +684,7 @@ void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { } void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { - +#if 0 SHADER_BUFFER* buffer = arg->buffer; DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; DWORD reg2 = arg->src[0] & WINED3DSP_REGNUM_MASK; @@ -672,6 +694,35 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { sprintf(dst_str, "T%u", reg1); shader_addline(buffer, "ADD TMP.rg, fragment.texcoord[%u], T%u;\n", reg1, reg2); shader_hw_sample(arg, reg1, dst_str, "TMP"); +#endif + IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + + DWORD dst = arg->dst; + DWORD src = arg->src[0] & WINED3DSP_REGNUM_MASK; + SHADER_BUFFER* buffer = arg->buffer; + + char reg_coord[40]; + DWORD reg_dest_code; + + /* All versions have a destination register */ + reg_dest_code = dst & WINED3DSP_REGNUM_MASK; + /* Can directly use the name because texbem is only valid for <= 1.3 shaders */ + pshader_get_register_name(dst, reg_coord); + + if(This->bumpenvmatconst) { + /*shader_addline(buffer, "MOV T%u, fragment.texcoord[%u];\n", 1, 1); Not needed - done already */ + shader_addline(buffer, "SWZ TMP2, bumpenvmat, x, z, 0, 0;\n"); + shader_addline(buffer, "DP3 TMP.r, TMP2, T%u;\n", src); + shader_addline(buffer, "SWZ TMP2, bumpenvmat, y, w, 0, 0;\n"); + shader_addline(buffer, "DP3 TMP.g, TMP2, T%u;\n", src); + shader_addline(buffer, "ADD TMP.rg, TMP, %s;\n", reg_coord); + /* Not sure about this, but hl2 needs it. It uses a projected texture with texbem and depends on the 4th coordinate */ + shader_addline(buffer, "MOV TMP.a, %s;\n", reg_coord); + shader_hw_sample(arg, reg_dest_code, reg_coord, "TMP"); + } else { + /* Without a bump matrix loaded, just sample with the unmodified coordinates */ + shader_hw_sample(arg, reg_dest_code, reg_coord, reg_coord); + } } void pshader_hw_texm3x2pad(SHADER_OPCODE_ARG* arg) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 566442b..f270af7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1767,15 +1767,50 @@ void pshader_glsl_texm3x3vspec(SHADER_OPCODE_ARG* arg) { /** Process the WINED3DSIO_TEXBEM instruction in GLSL. * Apply a fake bump map transform. - * FIXME: Should apply the BUMPMAPENV matrix. For now, just sample the texture */ + * texbem is pshader <= 1.3 only, this saves a few version checks + */ void pshader_glsl_texbem(SHADER_OPCODE_ARG* arg) { + IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; + char dst_swizzle[6]; + glsl_sample_function_t sample_function; + DWORD sampler_type; + DWORD sampler_idx; + BOOL projected; + DWORD mask = 0; + DWORD flags; + char coord_mask[6]; + + /* All versions have a destination register */ + shader_glsl_append_dst(arg->buffer, arg); + + sampler_idx = arg->dst & WINED3DSP_REGNUM_MASK; + flags = deviceImpl->stateBlock->textureState[sampler_idx][WINED3DTSS_TEXTURETRANSFORMFLAGS]; + + /* TODO: Does texbem even support projected textures? half-life 2 uses it */ + if (flags & WINED3DTTFF_PROJECTED) { + projected = TRUE; + switch (flags & ~WINED3DTTFF_PROJECTED) { + case WINED3DTTFF_COUNT1: FIXME("WINED3DTTFF_PROJECTED with WINED3DTTFF_COUNT1?\n"); break; + case WINED3DTTFF_COUNT2: mask = WINED3DSP_WRITEMASK_1; break; + case WINED3DTTFF_COUNT3: mask = WINED3DSP_WRITEMASK_2; break; + case WINED3DTTFF_COUNT4: + case WINED3DTTFF_DISABLE: mask = WINED3DSP_WRITEMASK_3; break; + } + } else { + projected = FALSE; + } + + sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; + shader_glsl_get_sample_function(sampler_type, projected, &sample_function); + mask |= sample_function.coord_mask; - DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; - DWORD reg2 = arg->src[0] & WINED3DSP_REGNUM_MASK; + shader_glsl_get_write_mask(arg->dst, dst_swizzle); - FIXME("Not applying the BUMPMAPENV matrix for pixel shader instruction texbem.\n"); - shader_addline(arg->buffer, "T%u = texture2D(Psampler%u, gl_TexCoord[%u].xy + T%u.xy);\n", - reg1, reg1, reg1, reg2); + shader_glsl_get_write_mask(mask, coord_mask); + FIXME("Bump map transform not handled yet\n"); + shader_addline(arg->buffer, "%s(Psampler%u, T%u%s)%s);\n", + sample_function.name, sampler_idx, sampler_idx, coord_mask, dst_swizzle); } /** Process the WINED3DSIO_TEXREG2AR instruction in GLSL

1 0