Józef Kucia : wined3d: Recompute sampler count before allocating sampler range for compute shaders.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Wed Mar 15 12:00:08 2017 +0100

wined3d: Recompute sampler count before allocating sampler range for compute shaders.

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/directx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 23b10ba..53255de 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -3716,7 +3716,9 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info)
     /* A majority of OpenGL implementations allow us to statically partition
      * the set of texture bindings into six separate sets. */
     gl_info->limits.graphics_samplers = gl_info->limits.combined_samplers;
-    sampler_count += gl_info->limits.samplers[WINED3D_SHADER_TYPE_COMPUTE];
+    sampler_count = 0;
+    for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i)
+        sampler_count += gl_info->limits.samplers[i];
     if (gl_info->limits.combined_samplers >= sampler_count)
         gl_info->limits.graphics_samplers -= gl_info->limits.samplers[WINED3D_SHADER_TYPE_COMPUTE];
 }