Move stuff common to vertex/fragment_program into the base class, including:

[mesa.git] / src / mesa / drivers / dri / r300 / r300_state.c

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 4422a233367753bb265a1babc94302f54bebee72..cc60785aac12c0c6fbb2ad0b15a3dfc57b0ce2b9 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1012,7 +1012,7 @@ void r300_setup_textures(GLcontext *ctx)
        GLuint OutputsWritten;
        
        if(hw_tcl_on)
-               OutputsWritten = CURRENT_VERTEX_SHADER(ctx)->OutputsWritten;
+               OutputsWritten = CURRENT_VERTEX_SHADER(ctx)->Base.OutputsWritten;
 
        R300_STATECHANGE(r300, txe);
        R300_STATECHANGE(r300, tex.filter);
@@ -1110,12 +1110,12 @@ void r300_setup_rs_unit(GLcontext *ctx)
        int i;
 
        if(hw_tcl_on)
-               OutputsWritten = CURRENT_VERTEX_SHADER(ctx)->OutputsWritten;
+               OutputsWritten = CURRENT_VERTEX_SHADER(ctx)->Base.OutputsWritten;
        else
                OutputsWritten = r300->state.render_inputs;
 
        if (ctx->FragmentProgram._Current)
-               InputsRead = ctx->FragmentProgram._Current->InputsRead;
+               InputsRead = ctx->FragmentProgram._Current->Base.InputsRead;
        else {
                fprintf(stderr, "No ctx->FragmentProgram._Current!!\n");
                return; /* This should only ever happen once.. */
@@ -1213,7 +1213,7 @@ void r300_setup_rs_unit(GLcontext *ctx)
        GLuint OutputsWritten;
        
        if(hw_tcl_on)
-               OutputsWritten = CURRENT_VERTEX_SHADER(ctx)->OutputsWritten;
+               OutputsWritten = CURRENT_VERTEX_SHADER(ctx)->Base.OutputsWritten;
        
        /* This needs to be rewritten - it is a hack at best */