Mesa (master): mesa: use implementation specified MAX_VERTEX_ATTRIBS rather than hardcoded value

[Timothy Arceri]

Module: Mesa
Branch: master
Commit: 87d2e15b1aa6f438983405aa25bf067034c898b0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=87d2e15b1aa6f438983405aa25bf067034c898b0

Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date:   Wed Jul  8 09:20:40 2015 +1000

mesa: use implementation specified MAX_VERTEX_ATTRIBS rather than hardcoded value

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 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 8d4b40e..b7a783c 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;
    }