commit 9342d269a4818bf18296b07baa98f577efd1735c
author Ian Romanick <ian.d.romanick@intel.com> Tue Jun 22 17:41:37 2010 -0700
committer Ian Romanick <ian.d.romanick@intel.com> Wed Jun 23 11:24:26 2010 -0700
tree e98763f12b9ad45ac817fe5adcb8af6c97db79d9
parent 6984670f97aa0668ccdc99891d2881dbd95103f8

linker: Limit attribute allocation to MAX_VERTEX_ATTRIBS

linker.cpp

diff --git a/linker.cpp b/linker.cpp
index 1f2cee1..76c3e9d 100644
--- a/linker.cpp
+++ b/linker.cpp
@@ -503,9 +503,13 @@
 
 bool
 assign_attribute_locations(glsl_shader *sh,
-			   struct gl_program_parameter_list *attrib)
+			   struct gl_program_parameter_list *attrib,
+			   unsigned max_attribute_index)
 {
-   unsigned used_locations = 0;
+   /* Mark invalid attribute locations as being used.
+    */
+   unsigned used_locations = (max_attribute_index >= 32)
+      ? ~0 : ~((1 << max_attribute_index) - 1);
 
    assert(sh->Type == GL_VERTEX_SHADER);
 
@@ -736,8 +740,14 @@
    assign_uniform_locations(prog);
 
    if (prog->_LinkedShaders[0]->Type == GL_VERTEX_SHADER)
+      /* 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_locations(prog->_LinkedShaders[0],
-				      prog->Attributes))
+				      prog->Attributes,
+				      16))
 	 goto done;
 
    /* FINISHME: Assign vertex shader output / fragment shader input