From a78bbd0816a894a366bf3824fbbfbc5c794cd61d Mon Sep 17 00:00:00 2001 From: Aapo Tahkola Date: Thu, 17 Mar 2005 21:50:01 +0000 Subject: Simple TCL stage and ability to disable vps. --- src/mesa/drivers/dri/r300/r300_maos.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '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 39d446034a..946eb31f0c 100644 --- a/src/mesa/drivers/dri/r300/r300_maos.c +++ b/src/mesa/drivers/dri/r300/r300_maos.c @@ -272,7 +272,7 @@ void r300EmitArrays(GLcontext * ctx, GLboolean immd) } \ } - if (rmesa->current_vp != NULL) { + if (rmesa->current_vp != NULL && ctx->VertexProgram._Enabled) { if (rmesa->current_vp->inputs[VERT_ATTRIB_POS] != -1) { inputs |= _TNL_BIT_POS; rmesa->state.aos[nr++].aos_reg = rmesa->current_vp->inputs[VERT_ATTRIB_POS]; @@ -497,7 +497,7 @@ drm_radeon_cmd_header_t *cmd = NULL; #endif /* Stage 3: VAP output */ - if (rmesa->current_vp != NULL) + if (rmesa->current_vp != NULL && ctx->VertexProgram._Enabled) outputs = rmesa->current_vp->outputs; else outputs = inputs; -- cgit v1.2.3