varying changes

diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index b07f90af02f727026c51e38b2055251afcf2c626..3887f18213aba9b6834aa64ddc9c93c10e2d0574 100644 (file)
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -199,7 +199,7 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state )
        (ctx->VertexProgram._Enabled && ctx->VertexProgram.PointSizeEnabled))
       RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_POINTSIZE );
 
-#if NEW_SLANG
+#if 1 /* XXX NEW_SLANG */
    RENDERINPUTS_SET_RANGE( tnl->render_inputs_bitset,
                            _TNL_FIRST_GENERIC, _TNL_LAST_GENERIC );
 #else

diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h
index d5414bd730d86ff90c74a8226f669af9977438ba..ea2a6bed5462e26d30f186fd21a598606b0cbf55 100644 (file)
--- a/src/mesa/tnl/t_context.h
+++ b/src/mesa/tnl/t_context.h
@@ -422,7 +422,7 @@ struct vertex_buffer
    GLvector4f  *ColorPtr[2];                   /* _TNL_BIT_COLOR0 */
    GLvector4f  *SecondaryColorPtr[2];           /* _TNL_BIT_COLOR1 */
    GLvector4f  *FogCoordPtr;                   /* _TNL_BIT_FOG */
-   GLvector4f  *VaryingPtr[MAX_VARYING_VECTORS];
+   GLvector4f  *VaryingPtr[MAX_VARYING];
 
    struct tnl_prim  *Primitive;                      
    GLuint      PrimitiveCount;