H. Verbeet : wined3d: Add WINED3DDTCAPS flags and use them.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: db8da81e67e27fa32aade74a0814150f71bffd87
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=db8da81e67e27fa32aade74a08...

Author: H. Verbeet 
Date:   Thu Feb 15 13:31:35 2007 +0100

wined3d: Add WINED3DDTCAPS flags and use them.

---

dlls/wined3d/directx.c      |   14 +++++++-------
 include/wine/wined3d_caps.h |   11 +++++++++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 3a36d56..97b2f9d 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2280,13 +2280,13 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
              * don't advertise it yet as I'm not sure how we handle it.
              * We might need to add some clamping in the shader engine to
              * support it.
-             * TODO: D3DDTCAPS_USHORT2N, D3DDTCAPS_USHORT4N, D3DDTCAPS_UDEC3, D3DDTCAPS_DEC3N */
-            *pCaps->DeclTypes = D3DDTCAPS_UBYTE4    |
-                                D3DDTCAPS_UBYTE4N   |
-                                D3DDTCAPS_SHORT2N   |
-                                D3DDTCAPS_SHORT4N   |
-                                D3DDTCAPS_FLOAT16_2 |
-                                D3DDTCAPS_FLOAT16_4;
+             * TODO: WINED3DDTCAPS_USHORT2N, WINED3DDTCAPS_USHORT4N, WINED3DDTCAPS_UDEC3, WINED3DDTCAPS_DEC3N */
+            *pCaps->DeclTypes = WINED3DDTCAPS_UBYTE4    |
+                                WINED3DDTCAPS_UBYTE4N   |
+                                WINED3DDTCAPS_SHORT2N   |
+                                WINED3DDTCAPS_SHORT4N   |
+                                WINED3DDTCAPS_FLOAT16_2 |
+                                WINED3DDTCAPS_FLOAT16_4;

} else
             *pCaps->DeclTypes                         = 0;
diff --git a/include/wine/wined3d_caps.h b/include/wine/wined3d_caps.h
index 5cb95dd..1a94b27 100644
--- a/include/wine/wined3d_caps.h
+++ b/include/wine/wined3d_caps.h
@@ -19,6 +19,17 @@
 #ifndef __WINE_WINED3D_CAPS_H
 #define __WINE_WINED3D_CAPS_H

+#define WINED3DDTCAPS_UBYTE4                                0x00000001
+#define WINED3DDTCAPS_UBYTE4N                               0x00000002
+#define WINED3DDTCAPS_SHORT2N                               0x00000004
+#define WINED3DDTCAPS_SHORT4N                               0x00000008
+#define WINED3DDTCAPS_USHORT2N                              0x00000010
+#define WINED3DDTCAPS_USHORT4N                              0x00000020
+#define WINED3DDTCAPS_UDEC3                                 0x00000040
+#define WINED3DDTCAPS_DEC3N                                 0x00000080
+#define WINED3DDTCAPS_FLOAT16_2                             0x00000100
+#define WINED3DDTCAPS_FLOAT16_4                             0x00000200
+
 #define WINED3DLINECAPS_TEXTURE                             0x00000001
 #define WINED3DLINECAPS_ZTEST                               0x00000002
 #define WINED3DLINECAPS_BLEND                               0x00000004