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.

wined3d: Don't skip applying texdims with shaders.
46109da8 · Stefan Dösinger · Alexandre Julliard · ec94c2ea · 46109da8 · 46109da8
Commit 46109da8 authored Aug 12, 2008 by Stefan Dösinger Committed by Alexandre Julliard Aug 21, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

nvidia_texture_shader.c dlls/wined3d/nvidia_texture_shader.c +0 -1

utils.c dlls/wined3d/utils.c +0 -1

No files found.
--- 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);

--- 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);