From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sun, 31 Aug 2003 18:55:23 +0000 (+0000)
Subject: update parameter indexing
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7961e67c2ae75f6cd32d7ac7cbe9f887da10c865;p=mesa.git

update parameter indexing
---

diff --git a/src/mesa/swrast/s_nvfragprog.c b/src/mesa/swrast/s_nvfragprog.c
index 63a30d4e7ce..92fc6ed4528 100644
--- a/src/mesa/swrast/s_nvfragprog.c
+++ b/src/mesa/swrast/s_nvfragprog.c
@@ -28,6 +28,7 @@
 #include "context.h"
 #include "nvfragprog.h"
 #include "macros.h"
+#include "program.h"
 
 #include "s_nvfragprog.h"
 #include "s_span.h"
@@ -123,8 +124,8 @@ fetch_vector4( GLcontext *ctx,
          src = ctx->FragmentProgram.Parameters[source->Index];
          break;
       case PROGRAM_NAMED_PARAM:
-         ASSERT(source->Index < program->NumParameters);
-         src = program->Parameters[source->Index].Values;
+         ASSERT(source->Index < program->Parameters->NumParameters);
+         src = program->Parameters->Parameters[source->Index].Values;
          break;
       case PROGRAM_STATE_VAR:
          abort();
@@ -316,8 +317,8 @@ fetch_vector1( GLcontext *ctx,
          src = ctx->FragmentProgram.Parameters[source->Index];
          break;
       case PROGRAM_NAMED_PARAM:
-         ASSERT(source->Index < program->NumParameters);
-         src = program->Parameters[source->Index].Values;
+         ASSERT(source->Index < program->Parameters->NumParameters);
+         src = program->Parameters->Parameters[source->Index].Values;
          break;
       case PROGRAM_STATE_VAR:
          abort();