Józef Kucia : wined3d: Bind dummy textures to all texture image units.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Mon Oct  3 00:38:38 2016 +0200

wined3d: Bind dummy textures to all texture image units.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/context.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index a362247..e09c6fd 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -1514,9 +1514,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC
 void context_bind_dummy_textures(const struct wined3d_device *device, const struct wined3d_context *context)
 {
     const struct wined3d_gl_info *gl_info = context->gl_info;
-    unsigned int i, count = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers);
+    unsigned int i;
 
-    for (i = 0; i < count; ++i)
+    for (i = 0; i < gl_info->limits.combined_samplers; ++i)
     {
         GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + i));
         checkGLcall("glActiveTexture");