[1/2] wined3d: Only set GL_SHADER_OPERATION_NV to GL_NONE for
mapped stages
H. Verbeet
hverbeet at gmail.com
Sun Jun 17 17:10:54 CDT 2007
Otherwise it'll disable whatever texture unit is active at the moment.
Changelog:
- Only set GL_SHADER_OPERATION_NV to GL_NONE for mapped stages
-------------- next part --------------
---
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;
More information about the wine-patches
mailing list