From 87d2e15b1aa6f438983405aa25bf067034c898b0 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 8 Jul 2015 09:20:40 +1000 Subject: [PATCH] mesa: use implementation specified MAX_VERTEX_ATTRIBS rather than hardcoded value Reviewed-by: Ilia Mirkin --- src/glsl/linker.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 8d4b40e4f0c..b7a783c0984 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -3070,12 +3070,8 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) } } - /* FINISHME: The value of the max_attribute_index parameter is - * FINISHME: implementation dependent based on the value of - * FINISHME: GL_MAX_VERTEX_ATTRIBS. GL_MAX_VERTEX_ATTRIBS must be - * FINISHME: at least 16, so hardcode 16 for now. - */ - if (!assign_attribute_or_color_locations(prog, MESA_SHADER_VERTEX, 16)) { + if (!assign_attribute_or_color_locations(prog, MESA_SHADER_VERTEX, + ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs)) { goto done; } -- 2.30.2