From: Józef Kucia Subject: [PATCH 09/10] wined3d: Store actual GL_MAX_TEXTURE_IMAGE_UNITS in "fragment_samplers". Message-Id: <20170221122447.9358-9-jkucia@codeweavers.com> Date: Tue, 21 Feb 2017 13:24:46 +0100 In-Reply-To: <20170221122447.9358-1-jkucia@codeweavers.com> References: <20170221122447.9358-1-jkucia@codeweavers.com> Signed-off-by: Józef Kucia --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 56193da..8342325 100644 --- 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 { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 83a6cae..07f1263 100644 --- 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; -- 2.10.2