From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 30 Jun 2010 01:58:20 +0000 (-0700)
Subject: linker: Don't automatically allocate VERT_ATTRIB_GENERIC0
X-Git-Tag: mesa-7.9-rc1~1173^2~559
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=982e3798d8b9bfec7ff3f37c52687036b36bc153;p=platform%2Fupstream%2Fmesa.git

linker: Don't automatically allocate VERT_ATTRIB_GENERIC0
---

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 719cae2..a53e91d 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -669,6 +669,12 @@ assign_attribute_locations(gl_shader_program *prog, unsigned max_attribute_index
 
    qsort(to_assign, num_attr, sizeof(to_assign[0]), temp_attr::compare);
 
+   /* VERT_ATTRIB_GENERIC0 is a psdueo-alias for VERT_ATTRIB_POS.  It can only
+    * be explicitly assigned by via glBindAttribLocation.  Mark it as reserved
+    * to prevent it from being automatically allocated below.
+    */
+   used_locations |= VERT_BIT_GENERIC0;
+
    for (unsigned i = 0; i < num_attr; i++) {
       /* Mask representing the contiguous slots that will be used by this
        * attribute.