H. Verbeet : wined3d: Only set GL_SHADER_OPERATION_NV to GL_NONE for mapped stages.

[Alexandre Julliard]

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

Author: H. Verbeet <hverbeet(a)gmail.com>
Date:   Mon Jun 18 00:10:54 2007 +0200

wined3d: Only set GL_SHADER_OPERATION_NV to GL_NONE for mapped stages.

---

 dlls/wined3d/state.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 54c62e4..a244d3a 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1674,9 +1674,9 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D
                 glDisable(GL_TEXTURE_CUBE_MAP_ARB);
                 checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)");
             }
-        }
-        if(GL_SUPPORT(NV_TEXTURE_SHADER2)) {
-            glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_NONE);
+            if(GL_SUPPORT(NV_TEXTURE_SHADER2)) {
+                glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_NONE);
+            }
         }
         /* All done */
         return;