s/15/VERT_RESULT_MAX/

diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index 3212e00195a73e83bd0b4b876f576aca7bb7f88e..e63740c55739ec6649c4c7a27cb6f10d24beb844 100644 (file)
--- 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 27f878c4e987afe61c2c3a6486c6205430e7368c..5461820fbb66558e77f007fd32b519c058190291 100644 (file)
--- 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. */