Stefan Dösinger : wined3d: Advertise a few line caps.

Alexandre Julliard julliard at winehq.org
Wed Aug 27 08:24:46 CDT 2008


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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Tue Aug 19 16:34:54 2008 +0200

wined3d: Advertise a few line caps.

---

 dlls/wined3d/directx.c      |   14 ++++++++------
 include/d3d9caps.h          |    1 +
 include/wine/wined3d_caps.h |    1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 7742347..c897e70 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -3252,12 +3252,14 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
     } else
         pCaps->VolumeTextureAddressCaps = 0;
 
-    pCaps->LineCaps = WINED3DLINECAPS_TEXTURE |
-                      WINED3DLINECAPS_ZTEST;
-                      /* FIXME: Add
-                        WINED3DLINECAPS_BLEND
-                        WINED3DLINECAPS_ALPHACMP
-                        WINED3DLINECAPS_FOG */
+    pCaps->LineCaps = WINED3DLINECAPS_TEXTURE       |
+                      WINED3DLINECAPS_ZTEST         |
+                      WINED3DLINECAPS_BLEND         |
+                      WINED3DLINECAPS_ALPHACMP      |
+                      WINED3DLINECAPS_FOG;
+    /* WINED3DLINECAPS_ANTIALIAS is not supported on Windows, and dx and gl seem to have a different
+     * idea how generating the smoothing alpha values works; the result is different
+     */
 
     pCaps->MaxTextureWidth  = GL_LIMITS(texture_size);
     pCaps->MaxTextureHeight = GL_LIMITS(texture_size);
diff --git a/include/d3d9caps.h b/include/d3d9caps.h
index c66d291..8ed6598 100644
--- a/include/d3d9caps.h
+++ b/include/d3d9caps.h
@@ -67,6 +67,7 @@
 #define D3DLINECAPS_BLEND             0x04
 #define D3DLINECAPS_ALPHACMP          0x08
 #define D3DLINECAPS_FOG               0x10
+#define D3DLINECAPS_ANTIALIAS         0x20
 
 #define D3DPBLENDCAPS_ZERO            0x00000001
 #define D3DPBLENDCAPS_ONE             0x00000002
diff --git a/include/wine/wined3d_caps.h b/include/wine/wined3d_caps.h
index 91fa788..1cfbbd4 100644
--- a/include/wine/wined3d_caps.h
+++ b/include/wine/wined3d_caps.h
@@ -53,6 +53,7 @@
 #define WINED3DLINECAPS_BLEND                               0x00000004
 #define WINED3DLINECAPS_ALPHACMP                            0x00000008
 #define WINED3DLINECAPS_FOG                                 0x00000010
+#define WINED3DLINECAPS_ANTIALIAS                           0x00000020
 
 #define WINED3DMAX30SHADERINSTRUCTIONS                      32768
 #define WINED3DMIN30SHADERINSTRUCTIONS                      512




More information about the wine-cvs mailing list