H. Verbeet : wined3d: Only set GL_SHADER_OPERATION_NV to GL_NONE for supported units.

[Alexandre Julliard]

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

Author: H. Verbeet <hverbeet at gmail.com>
Date:   Sun Jul  1 23:41:15 2007 +0200

wined3d: Only set GL_SHADER_OPERATION_NV to GL_NONE for supported units.

---

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

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index bdb4d5b..8223e30 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1707,7 +1707,7 @@ 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)) {
+            if(GL_SUPPORT(NV_TEXTURE_SHADER2) && mapped_stage < GL_LIMITS(textures)) {
                 glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_NONE);
             }
         }