Matteo Bruni : include: Add d3d9 enum values and defines for dual source blending.

Alexandre Julliard julliard at winehq.org
Mon Mar 12 17:40:24 CDT 2018


Module: wine
Branch: master
Commit: 5147ffe42e626e4c165c4767dfa3cf2d62bfe846
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5147ffe42e626e4c165c4767dfa3cf2d62bfe846

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Fri Mar  9 12:10:41 2018 -0600

include: Add d3d9 enum values and defines for dual source blending.

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 include/d3d9caps.h  | 32 ++++++++++++++++++--------------
 include/d3d9types.h |  4 ++++
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/include/d3d9caps.h b/include/d3d9caps.h
index 424b20c..24ba14c 100644
--- a/include/d3d9caps.h
+++ b/include/d3d9caps.h
@@ -73,20 +73,24 @@
 #define D3DLINECAPS_FOG               0x10
 #define D3DLINECAPS_ANTIALIAS         0x20
 
-#define D3DPBLENDCAPS_ZERO            0x00000001
-#define D3DPBLENDCAPS_ONE             0x00000002
-#define D3DPBLENDCAPS_SRCCOLOR        0x00000004
-#define D3DPBLENDCAPS_INVSRCCOLOR     0x00000008
-#define D3DPBLENDCAPS_SRCALPHA        0x00000010
-#define D3DPBLENDCAPS_INVSRCALPHA     0x00000020
-#define D3DPBLENDCAPS_DESTALPHA       0x00000040
-#define D3DPBLENDCAPS_INVDESTALPHA    0x00000080
-#define D3DPBLENDCAPS_DESTCOLOR       0x00000100
-#define D3DPBLENDCAPS_INVDESTCOLOR    0x00000200
-#define D3DPBLENDCAPS_SRCALPHASAT     0x00000400
-#define D3DPBLENDCAPS_BOTHSRCALPHA    0x00000800
-#define D3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000
-#define D3DPBLENDCAPS_BLENDFACTOR     0x00002000
+#define D3DPBLENDCAPS_ZERO            __MSABI_LONG(0x00000001)
+#define D3DPBLENDCAPS_ONE             __MSABI_LONG(0x00000002)
+#define D3DPBLENDCAPS_SRCCOLOR        __MSABI_LONG(0x00000004)
+#define D3DPBLENDCAPS_INVSRCCOLOR     __MSABI_LONG(0x00000008)
+#define D3DPBLENDCAPS_SRCALPHA        __MSABI_LONG(0x00000010)
+#define D3DPBLENDCAPS_INVSRCALPHA     __MSABI_LONG(0x00000020)
+#define D3DPBLENDCAPS_DESTALPHA       __MSABI_LONG(0x00000040)
+#define D3DPBLENDCAPS_INVDESTALPHA    __MSABI_LONG(0x00000080)
+#define D3DPBLENDCAPS_DESTCOLOR       __MSABI_LONG(0x00000100)
+#define D3DPBLENDCAPS_INVDESTCOLOR    __MSABI_LONG(0x00000200)
+#define D3DPBLENDCAPS_SRCALPHASAT     __MSABI_LONG(0x00000400)
+#define D3DPBLENDCAPS_BOTHSRCALPHA    __MSABI_LONG(0x00000800)
+#define D3DPBLENDCAPS_BOTHINVSRCALPHA __MSABI_LONG(0x00001000)
+#define D3DPBLENDCAPS_BLENDFACTOR     __MSABI_LONG(0x00002000)
+#ifndef D3D_DISABLE_9EX
+#define D3DPBLENDCAPS_SRCCOLOR2       __MSABI_LONG(0x00004000)
+#define D3DPBLENDCAPS_INVSRCCOLOR2    __MSABI_LONG(0x00008000)
+#endif
 
 #define D3DPCMPCAPS_NEVER        0x01
 #define D3DPCMPCAPS_LESS         0x02
diff --git a/include/d3d9types.h b/include/d3d9types.h
index ed14e9b..bb7e3a0 100644
--- a/include/d3d9types.h
+++ b/include/d3d9types.h
@@ -679,6 +679,10 @@ typedef enum _D3DBLEND {
     D3DBLEND_BOTHINVSRCALPHA    = 13,
     D3DBLEND_BLENDFACTOR        = 14,
     D3DBLEND_INVBLENDFACTOR     = 15,
+#ifndef D3D_DISABLE_9EX
+    D3DBLEND_SRCCOLOR2          = 16,
+    D3DBLEND_INVSRCCOLOR2       = 17,
+#endif
     D3DBLEND_FORCE_DWORD        = 0x7fffffff
 } D3DBLEND;
 




More information about the wine-cvs mailing list