Stefan Dösinger : wined3d: Don' t skip applying texdims with shaders.

[Alexandre Julliard]

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

Author: Stefan Dösinger 
Date:   Tue Aug 12 13:06:25 2008 -0500

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, 0 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c
index d11c6af..5f36668 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 e56b4b9..df291ea 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);