[07/10] wined3d: Add WINED3DPBLENDCAPS flags and use them

[H. Verbeet]

On 14/02/07, H. Verbeet <hverbeet at gmail.com> wrote:
> Changelog:
>   - Add WINED3DPBLENDCAPS flags and use them
>
>
This is the correct patch
-------------- next part --------------
---

 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 e31740d..1753ef9 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1932,35 +1932,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