wined3d: Store actual GL_MAX_TEXTURE_IMAGE_UNITS in "fragment_samplers".

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

wined3d: Store actual GL_MAX_TEXTURE_IMAGE_UNITS in "fragment_samplers".
3f3b3e17 · Józef Kucia · Alexandre Julliard · 9acc780a · 3f3b3e17 · 3f3b3e17
Commit 3f3b3e17 authored Feb 21, 2017 by Józef Kucia Committed by Alexandre Julliard Feb 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

directx.c dlls/wined3d/directx.c +1 -1

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

No files found.
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -3419,7 +3419,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info)
            gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max);
            gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max);
            gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &gl_max);
-            gl_info->limits.fragment_samplers = min(MAX_FRAGMENT_SAMPLERS, gl_max);
+            gl_info->limits.fragment_samplers = gl_max;
        }
        else
        {

--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -3323,7 +3323,7 @@ static void tex_coordindex(struct wined3d_context *context, const struct wined3d
        return;
    }

-    if (mapped_stage >= gl_info->limits.fragment_samplers)
+    if (mapped_stage >= min(gl_info->limits.fragment_samplers, MAX_FRAGMENT_SAMPLERS))
    {
        WARN("stage %u not mapped to a valid texture unit (%u)\n", stage, mapped_stage);
        return;