Roderick Colenbrander : wined3d: Fix a number of badly reported caps.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Aug 4 14:57:29 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 95b047c2fe60d4680d5a75a0770c03cbaf9a1ad4
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=95b047c2fe60d4680d5a75a0770c03cbaf9a1ad4

Author: Roderick Colenbrander <thunderbird2k at gmx.net>
Date:   Fri Aug  4 19:14:16 2006 +0200

wined3d: Fix a number of badly reported caps.

---

 dlls/wined3d/directx.c |   43 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 1fa4a5e..fc4cd26 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1732,9 +1732,44 @@ static HRESULT WINAPI IWineD3DImpl_GetDe
                        D3DPCMPCAPS_NEVER        |
                        D3DPCMPCAPS_NOTEQUAL;
 
-    *pCaps->SrcBlendCaps  = 0xFFFFFFFF;   /*FIXME: Tidy up later */
-    *pCaps->DestBlendCaps = 0xFFFFFFFF;   /*FIXME: Tidy up later */
-    *pCaps->AlphaCmpCaps  = 0xFFFFFFFF;   /*FIXME: Tidy up later */
+    *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->AlphaCmpCaps = D3DPCMPCAPS_ALWAYS       |
+                           D3DPCMPCAPS_EQUAL        |
+                           D3DPCMPCAPS_GREATER      |
+                           D3DPCMPCAPS_GREATEREQUAL |
+                           D3DPCMPCAPS_LESS         |
+                           D3DPCMPCAPS_LESSEQUAL    |
+                           D3DPCMPCAPS_NEVER        |
+                           D3DPCMPCAPS_NOTEQUAL;
 
     *pCaps->ShadeCaps     = WINED3DPSHADECAPS_SPECULARGOURAUDRGB |
                             WINED3DPSHADECAPS_COLORGOURAUDRGB    |
@@ -1778,7 +1813,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDe
     *pCaps->CubeTextureFilterCaps = 0;
     *pCaps->VolumeTextureFilterCaps = 0;
 
-    *pCaps->TextureAddressCaps =  D3DPTADDRESSCAPS_BORDER |
+    *pCaps->TextureAddressCaps =  D3DPTADDRESSCAPS_INDEPENDENTUV |
                                   D3DPTADDRESSCAPS_CLAMP  |
                                   D3DPTADDRESSCAPS_WRAP;
 




More information about the wine-cvs mailing list