wined3d: Don't enable texture dimensions with shaders.

ARB and GLSL don't need that. If a shader backend like atifs or nvts need it in the future, the shader backend should deal with that rather than the ffp pipeline.

wined3d: Don't enable texture dimensions with shaders.
ec94c2ea · Stefan Dösinger · Alexandre Julliard · 77204574 · ec94c2ea
Commit ec94c2ea authored Aug 12, 2008 by Stefan Dösinger Committed by Alexandre Julliard Aug 21, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 12 deletions

state.c dlls/wined3d/state.c +1 -12

No files found.
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -3528,18 +3528,7 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont
            checkGLcall("glTexEnvi(GL_TEXTURE_LOD_BIAS_EXT, ...)");
        }

-        if (stateblock->wineD3DDevice->ps_selected_mode != SHADER_NONE && stateblock->pixelShader &&
-            ((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.function) {
-            /* Using a pixel shader? Verify the sampler types */
-
-            /* Make sure that the texture dimensions are enabled. I don't have to disable the other
-             * dimensions because the shader knows from which texture type to sample from. For the sake of
-             * debugging all dimensions could be enabled and a texture with some ugly pink bound to the unused
-             * dimensions. This should make wrong sampling sources visible :-)
-             */
-            glEnable(stateblock->textureDimensions[sampler]);
-            checkGLcall("glEnable(stateblock->textureDimensions[sampler])");
-        } else if(sampler < stateblock->lowest_disabled_stage) {
+        if(!use_ps(stateblock->wineD3DDevice) && sampler < stateblock->lowest_disabled_stage) {
            if(stateblock->renderState[WINED3DRS_COLORKEYENABLE] && sampler == 0) {
                /* If color keying is enabled update the alpha test, it depends on the existence
                 * of a color key in stage 0