Henri Verbeet : wined3d: Bind sampler objects to the correct texture stage.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Apr 15 11:07:11 2015 +0200

wined3d: Bind sampler objects to the correct texture stage.

On current hardware this generally only makes a difference for vertex
textures. This fixes a regression introduced by commit
c6232e1d111ae8929c53c02211cde4a9777311fd.

---

 dlls/wined3d/state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 39b0256..7efbf3d 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -3717,7 +3717,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state
 
             if (sampler)
             {
-                GL_EXTCALL(glBindSampler(sampler_idx, sampler->name));
+                GL_EXTCALL(glBindSampler(mapped_stage, sampler->name));
                 checkGLcall("glBindSampler");
             }
         }