summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-11-03 02:28:47 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-11-03 02:28:47 +0000
commit7ae9713a609531164b3c7690e0d5b993a00eaa77 (patch)
treeb3afc2334e656f51f7822a1c7f14a46c32e62010
parent1624162b0ca78fe2174418dd303c51d8eb80ff25 (diff)
s/15/VERT_RESULT_MAX/
-rw-r--r--src/mesa/tnl/t_vb_arbprogram.c5
-rw-r--r--src/mesa/tnl/t_vb_arbprogram.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index 3212e00195..e63740c557 100644
--- a/src/mesa/tnl/t_vb_arbprogram.c
+++ b/src/mesa/tnl/t_vb_arbprogram.c
@@ -1216,7 +1216,8 @@ run_arb_vertex_program(GLcontext *ctx, struct tnl_pipeline_stage *stage)
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
struct arb_vp_machine *m = ARB_VP_MACHINE(stage);
struct tnl_compiled_program *p;
- GLuint i, j, outputs;
+ GLuint i, j;
+ GLbitfield outputs;
if (!program || program->IsNVProgram)
return GL_TRUE;
@@ -1242,7 +1243,7 @@ run_arb_vertex_program(GLcontext *ctx, struct tnl_pipeline_stage *stage)
}
}
- for (i = 0; i < 15; i++) {
+ for (i = 0; i < VERT_RESULT_MAX; i++) {
if (program->OutputsWritten & (1<<i)) {
GLuint j = m->nr_outputs++;
m->output[j].idx = i;
diff --git a/src/mesa/tnl/t_vb_arbprogram.h b/src/mesa/tnl/t_vb_arbprogram.h
index 27f878c4e9..5461820fbb 100644
--- a/src/mesa/tnl/t_vb_arbprogram.h
+++ b/src/mesa/tnl/t_vb_arbprogram.h
@@ -158,7 +158,7 @@ struct arb_vp_machine {
struct input input[_TNL_ATTRIB_MAX];
GLuint nr_inputs;
- struct output output[15];
+ struct output output[VERT_RESULT_MAX];
GLuint nr_outputs;
GLvector4f attribs[VERT_RESULT_MAX]; /**< result vectors. */