diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-11-12 17:53:14 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-11-12 17:53:14 +0000 |
| commit | de99760bf3511d05185799c4fb4347f9e5f420f4 (patch) | |
| tree | a0bda8570a2943b4c7dabc51b7a61e5c5344eded /src/mesa/drivers/dri/r300/r300_state.c | |
| parent | 77ee31930a1b0cc7766939415f4f04ed6a1fa4ac (diff) | |
Move stuff common to vertex/fragment_program into the base class, including:
Instructions, InputsRead, OutputsWritten, and Parameters.
Also, added debug functions: _mesa_print_instruction(),
_mesa_print_program_parameters() and revamp _mesa_print_program().
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 4422a23336..cc60785aac 100644 --- 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 */ |