[5/5] wined3d: Only set GL_SHADER_OPERATION_NV to GL_NONE for fixed
function texture units
H. Verbeet
hverbeet at gmail.com
Wed Jun 27 16:47:52 CDT 2007
Similar to the previous patch
Changelog:
- Only set GL_SHADER_OPERATION_NV to GL_NONE for fixed function texture units
-------------- next part --------------
---
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);
}
}
More information about the wine-patches
mailing list