diff options
| -rw-r--r-- | src/mesa/tnl/t_vb_arbprogram.c | 5 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_arbprogram.h | 2 |
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. */ |