diff options
| author | Aapo Tahkola <[email protected]> | 2005-04-30 11:06:14 +0000 |
|---|---|---|
| committer | Aapo Tahkola <[email protected]> | 2005-04-30 11:06:14 +0000 |
| commit | 7d33053e47c8e70a1530d810babab6294ae19782 (patch) | |
| tree | 6d05251e15eb759f1adcc61d3358131a1b20d808 /src/mesa/drivers/dri/r300/r300_texprog.c | |
| parent | 47d18cbb6457316896524eb383f864d0ac0d638d (diff) | |
r300 side support for fixed function pipeline. This isnt functional with current Mesa.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_texprog.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_texprog.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_texprog.c b/src/mesa/drivers/dri/r300/r300_texprog.c index d38acd840da..f90c4bacb88 100644 --- a/src/mesa/drivers/dri/r300/r300_texprog.c +++ b/src/mesa/drivers/dri/r300/r300_texprog.c @@ -223,6 +223,7 @@ void r300GenerateTextureFragmentShader(r300ContextPtr r300) struct r300_pixel_shader_program *p = &ps->program; GLcontext *ctx = r300->radeon.glCtx; int i, tc_reg; + GLuint OutputsWritten = CURRENT_VERTEX_SHADER(ctx)->OutputsWritten; p->tex.length = 0; p->alu.length = 0; @@ -235,7 +236,7 @@ void r300GenerateTextureFragmentShader(r300ContextPtr r300) tc_reg = 0; for (i=0;i<ctx->Const.MaxTextureUnits;i++) { - if (r300->state.render_inputs & (_TNL_BIT_TEX0<<i)) { + if (TMU_ENABLED(ctx, i)) { ps->have_sample = 0; ps->src_previous = emit_texenv(r300, tc_reg, i); tc_reg++; |