Roderick Colenbrander : wined3d: Primitive misc caps fix.

[Alexandre Julliard]

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

Author: Roderick Colenbrander 
Date:   Fri Aug  4 22:37:27 2006 +0200

wined3d: Primitive misc caps fix.

---

dlls/wined3d/directx.c |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index fc4cd26..375906b 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1692,13 +1692,30 @@ static HRESULT WINAPI IWineD3DImpl_GetDe
                                       WINED3DDEVCAPS_DRAWPRIMITIVES2     |
                                       WINED3DDEVCAPS_DRAWPRIMITIVES2EX;

-    *pCaps->PrimitiveMiscCaps       = D3DPMISCCAPS_CULLCCW               |
+    *pCaps->PrimitiveMiscCaps       = D3DPMISCCAPS_CULLNONE              |
+                                      D3DPMISCCAPS_CULLCCW               |
                                       D3DPMISCCAPS_CULLCW                |
                                       D3DPMISCCAPS_COLORWRITEENABLE      |
                                       D3DPMISCCAPS_CLIPTLVERTS           |
                                       D3DPMISCCAPS_CLIPPLANESCALEDPOINTS |
-                                      D3DPMISCCAPS_MASKZ;
-                               /*NOT: D3DPMISCCAPS_TSSARGTEMP*/
+                                      D3DPMISCCAPS_MASKZ                 |
+                                      D3DPMISCCAPS_BLENDOP;
+                                    /* TODO:
+                                        D3DPMISCCAPS_NULLREFERENCE
+                                        D3DPMISCCAPS_INDEPENDENTWRITEMASKS
+                                        D3DPMISCCAPS_FOGANDSPECULARALPHA
+                                        D3DPMISCCAPS_SEPARATEALPHABLEND
+                                        D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS
+                                        D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING
+                                        D3DPMISCCAPS_FOGVERTEXCLAMPED */
+
+/* The caps below can be supported but aren't handled yet in utils.c 'd3dta_to_combiner_input', disable them until support is fixed */
+#if 0
+    if (GL_SUPPORT(NV_REGISTER_COMBINERS))
+        *pCaps->PrimitiveMiscCaps |=  D3DPMISCCAPS_TSSARGTEMP;
+    if (GL_SUPPORT(NV_REGISTER_COMBINERS2))
+        *pCaps->PrimitiveMiscCaps |=  D3DPMISCCAPS_PERSTAGECONSTANT;
+#endif

*pCaps->RasterCaps              = WINED3DPRASTERCAPS_DITHER    |
                                       WINED3DPRASTERCAPS_PAT       |