From 46109da87d8ca5d078ce287aba53fa38fbaa6e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= Date: Tue, 12 Aug 2008 13:06:25 -0500 Subject: [PATCH] wined3d: Don't skip applying texdims with shaders. There's no need to do that with the nvts and opengl ffp fixed function fragment pipeline, it's perfectly well defined in GL which one takes effect. This removes a few more troubles when switching between shaders and arbfp. --- dlls/wined3d/nvidia_texture_shader.c | 1 - dlls/wined3d/utils.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index d11c6af1967..5f3666875c0 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -558,7 +558,6 @@ void nvts_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext */ if(mapped_stage == -1 || mapped_stage >= GL_LIMITS(textures)) return; if(sampler >= stateblock->lowest_disabled_stage) return; - if(use_ps(stateblock->wineD3DDevice)) return; if(isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) return; nvts_activate_dimensions(sampler, stateblock, context); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e56b4b98d7d..df291ea7515 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2081,7 +2081,6 @@ void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont */ if(mapped_stage == -1 || mapped_stage >= GL_LIMITS(textures)) return; if(sampler >= stateblock->lowest_disabled_stage) return; - if(use_ps(stateblock->wineD3DDevice)) return; if(isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) return; texture_activate_dimensions(sampler, stateblock, context);