Roderick Colenbrander : wined3d: Textureops caps fix.

[Alexandre Julliard]

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

Author: Roderick Colenbrander 
Date:   Mon Aug  7 20:09:24 2006 +0200

wined3d: Textureops caps fix.

---

dlls/wined3d/directx.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 7da6b9d..62f858a 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1950,10 +1950,7 @@ #endif
                              D3DTEXOPCAPS_SELECTARG1  |
                              D3DTEXOPCAPS_SELECTARG2  |
                              D3DTEXOPCAPS_DISABLE;
-#if defined(GL_VERSION_1_3)
-    *pCaps->TextureOpCaps |= D3DTEXOPCAPS_DOTPRODUCT3 |
-                             D3DTEXOPCAPS_SUBTRACT;
-#endif
+
     if (GL_SUPPORT(ARB_TEXTURE_ENV_COMBINE) ||
         GL_SUPPORT(EXT_TEXTURE_ENV_COMBINE) ||
         GL_SUPPORT(NV_TEXTURE_ENV_COMBINE4)) {
@@ -1961,7 +1958,8 @@ #endif
                                 D3DTEXOPCAPS_BLENDTEXTUREALPHA  |
                                 D3DTEXOPCAPS_BLENDFACTORALPHA   |
                                 D3DTEXOPCAPS_BLENDCURRENTALPHA  |
-                                D3DTEXOPCAPS_LERP;
+                                D3DTEXOPCAPS_LERP               |
+                                D3DTEXOPCAPS_SUBTRACT;
     }
     if (GL_SUPPORT(NV_TEXTURE_ENV_COMBINE4)) {
         *pCaps->TextureOpCaps |= D3DTEXOPCAPS_ADDSMOOTH             |
@@ -1970,7 +1968,15 @@ #endif
                                 D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA |
                                 D3DTEXOPCAPS_BLENDTEXTUREALPHAPM;
     }
+    if (GL_SUPPORT(ARB_TEXTURE_ENV_DOT3))
+        *pCaps->TextureOpCaps |= D3DTEXOPCAPS_DOTPRODUCT3;

+    if (GL_SUPPORT(NV_REGISTER_COMBINERS)) {
+        *pCaps->TextureOpCaps |= D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR |
+                                 D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA;
+    }
+    
+    
 #if 0
     *pCaps->TextureOpCaps |= D3DTEXOPCAPS_BUMPENVMAP;
                             /* FIXME: Add