From: Eric Anholt <eric@anholt.net>
Date: Wed, 30 Jun 2010 21:28:38 +0000 (-0700)
Subject: mesa: Don't look in unallocatd param slots for parameter values.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3e2127b9dea6fd0628c4d7cb9e338d83583d2729;p=mesa.git

mesa: Don't look in unallocatd param slots for parameter values.

glsl-derivs would add 40.0, 0.0, and 1.0 in order.  When we went
looking for 0.0, we'd find it in the second slot of the param, and use
it, but param->Size would still be 1.  When we went to add 1.0 and
didn't find it, we'd put allocate it to that second slot and the 0.0
would actualy end up being 1.0.

Fixes glsl-derivs, glsl-deriv-varyings.
---

diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index aac488c79ab..ddbfe95c152 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -591,7 +591,7 @@ _mesa_lookup_parameter_constant(const struct gl_program_parameter_list *list,
              if (vSize == 1) {
                 /* look for v[0] anywhere within float[4] value */
                 GLuint j;
-                for (j = 0; j < 4; j++) {
+                for (j = 0; j < list->Parameters[i].Size; j++) {
                    if (list->ParameterValues[i][j] == v[0]) {
                       /* found it */
                       *posOut = i;