Module: wine Branch: master Commit: 8fdd88b42ce27437c8247f4f5993dd1dc4da8cb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fdd88b42ce27437c8247f4f59...
Author: H. Verbeet hverbeet@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