radeon: Drop the unused first arg of OUT_BATCH_RELOC.

[mesa.git] / src / mesa / drivers / dri / r200 / r200_vertprog.c

diff --git a/src/mesa/drivers/dri/r200/r200_vertprog.c b/src/mesa/drivers/dri/r200/r200_vertprog.c
index c3606b50ff06e045ffb246bc6c3b334cd5a8ea55..7076ec0c7f377356019c4a46573c1ad5ed0ffae1 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_vertprog.c
+++ b/src/mesa/drivers/dri/r200/r200_vertprog.c
@@ -30,6 +30,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  *   Aapo Tahkola <aet@rasterburn.org>
  *   Roland Scheidegger <rscheidegger_lists@hispeed.ch>
  */
+
+#include "main/errors.h"
 #include "main/glheader.h"
 #include "main/macros.h"
 #include "main/enums.h"
@@ -120,14 +122,16 @@ static GLboolean r200VertexProgUpdateParams(struct gl_context *ctx, struct r200_
    }
 
    for(pi = 0; pi < paramList->NumParameters; pi++) {
+      unsigned pvo = paramList->ParameterValueOffset[pi];
+
       switch(paramList->Parameters[pi].Type) {
       case PROGRAM_STATE_VAR:
       //fprintf(stderr, "%s", vp->Parameters->Parameters[pi].Name);
       case PROGRAM_CONSTANT:
-        *fcmd++ = paramList->ParameterValues[pi][0].f;
-        *fcmd++ = paramList->ParameterValues[pi][1].f;
-        *fcmd++ = paramList->ParameterValues[pi][2].f;
-        *fcmd++ = paramList->ParameterValues[pi][3].f;
+        *fcmd++ = paramList->ParameterValues[pvo + 0].f;
+        *fcmd++ = paramList->ParameterValues[pvo + 1].f;
+        *fcmd++ = paramList->ParameterValues[pvo + 2].f;
+        *fcmd++ = paramList->ParameterValues[pvo + 3].f;
         break;
       default:
         _mesa_problem(NULL, "Bad param type in %s", __func__);
@@ -456,7 +460,7 @@ static GLboolean r200_translate_vertex_program(struct gl_context *ctx, struct r2
    if ((mesa_vp->info.outputs_written & (1 << VARYING_SLOT_FOGC)) &&
        !vp->fogpidx) {
       struct gl_program_parameter_list *paramList;
-      gl_state_index tokens[STATE_LENGTH] = { STATE_FOG_PARAMS, 0, 0, 0, 0 };
+      gl_state_index16 tokens[STATE_LENGTH] = { STATE_FOG_PARAMS, 0, 0, 0, 0 };
       paramList = mesa_vp->Parameters;
       vp->fogpidx = _mesa_add_state_reference(paramList, tokens);
    }