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

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

diff --git a/src/mesa/drivers/dri/r300/r300_maos.c b/src/mesa/drivers/dri/r300/r300_maos.c
index 52827c2d5dcaf401c2827751707d1edc42f620f2..6de0fb14f0f2f22ce892d95718832cb453da5402 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_maos.c
+++ b/src/mesa/drivers/dri/r300/r300_maos.c
@@ -296,7 +296,7 @@ void r300EmitArrays(GLcontext * ctx, GLboolean immd)
 }
 
        if (hw_tcl_on) {
-               GLuint InputsRead = CURRENT_VERTEX_SHADER(ctx)->InputsRead;
+               GLuint InputsRead = CURRENT_VERTEX_SHADER(ctx)->Base.InputsRead;
                struct r300_vertex_program *prog=(struct r300_vertex_program *)CURRENT_VERTEX_SHADER(ctx);
                if (InputsRead & (1<<VERT_ATTRIB_POS)) {
                        inputs |= _TNL_BIT_POS;
@@ -517,7 +517,7 @@ void r300EmitArrays(GLcontext * ctx, GLboolean immd)
        r300->hw.vof.cmd[R300_VOF_CNTL_0]=0;
        r300->hw.vof.cmd[R300_VOF_CNTL_1]=0;
        if (hw_tcl_on){
-               GLuint OutputsWritten = CURRENT_VERTEX_SHADER(ctx)->OutputsWritten;
+               GLuint OutputsWritten = CURRENT_VERTEX_SHADER(ctx)->Base.OutputsWritten;
                
                if(OutputsWritten & (1<<VERT_RESULT_HPOS))
                        r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__POS_PRESENT;