clover/device: Move device_version into core and add device_clc_version

[mesa.git] / src / mesa / program / prog_parameter.c

diff --git a/src/mesa/program/prog_parameter.c b/src/mesa/program/prog_parameter.c
index 6689c71f24df1d6906f7c1b08d9e896c9afe8398..40bc47de358e375324bc63ebee8ca85471cdf319 100644 (file)
--- a/src/mesa/program/prog_parameter.c
+++ b/src/mesa/program/prog_parameter.c
@@ -267,9 +267,8 @@ _mesa_add_parameter(struct gl_program_parameter_list *paramList,
             COPY_4V(paramList->ParameterValues[oldNum + i], values);
          } else {
             /* copy 1, 2 or 3 values */
-            GLuint remaining = size % 4;
-            assert(remaining < 4);
-            for (j = 0; j < remaining; j++) {
+            assert(size < 4);
+            for (j = 0; j < size; j++) {
                paramList->ParameterValues[oldNum + i][j].f = values[j].f;
             }
             /* fill in remaining positions with zeros */
@@ -278,7 +277,6 @@ _mesa_add_parameter(struct gl_program_parameter_list *paramList,
             }
          }
          values += 4;
-         p->Initialized = GL_TRUE;
       } else {
          /* silence valgrind */
          for (j = 0; j < 4; j++)