diff options
| author | Aapo Tahkola <[email protected]> | 2005-03-17 21:50:01 +0000 |
|---|---|---|
| committer | Aapo Tahkola <[email protected]> | 2005-03-17 21:50:01 +0000 |
| commit | a78bbd0816a894a366bf3824fbbfbc5c794cd61d (patch) | |
| tree | 81d09667294cf4b600f691c4e5f6a48f08d9bc90 /src/mesa/drivers/dri/r300/r300_maos.c | |
| parent | 80a939cafb7a67837a9fc82e45b5ec85c5912a06 (diff) | |
Simple TCL stage and ability to disable vps.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_maos.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_maos.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_maos.c b/src/mesa/drivers/dri/r300/r300_maos.c index 39d446034ae..946eb31f0c4 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; |