wined3d: Take the texUnitMap into account when loading shader_glsl_load_psamplers().

8311ff32 · H. Verbeet · Alexandre Julliard · 2256e06d · 8311ff32
Commit 8311ff32 authored Jun 12, 2007 by H. Verbeet Committed by Alexandre Julliard Jun 13, 2007
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

glsl_shader.c dlls/wined3d/glsl_shader.c +3 -2

No files found.
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -90,8 +90,9 @@ static void shader_glsl_load_psamplers(
            snprintf(sampler_name, sizeof(sampler_name), "Psampler%d", i);
            name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name));
            if (name_loc != -1) {
-               TRACE("Loading %s for texture %d\n", sampler_name, i);
-               GL_EXTCALL(glUniform1iARB(name_loc, i));
+                int mapped_unit = stateBlock->wineD3DDevice->texUnitMap[i];
+                TRACE("Loading %s for texture %d\n", sampler_name, mapped_unit);
+                GL_EXTCALL(glUniform1iARB(name_loc, mapped_unit));
                checkGLcall("glUniform1iARB");
            }
        }