diff options
| author | Aapo Tahkola <aet@rasterburn.org> | 2005-03-18 14:44:27 +0000 |
|---|---|---|
| committer | Aapo Tahkola <aet@rasterburn.org> | 2005-03-18 14:44:27 +0000 |
| commit | 6bd390743da6e01410f3fc124d79956629e2a6f2 (patch) | |
| tree | 0ebe32a26233b0cd84187158d85cca802bb7fa42 /src/mesa/drivers/dri/r300/r300_maos.c | |
| parent | 2fb2e27e28569371bd0d12aa74504d53bb04edc0 (diff) | |
Misc fixes.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_maos.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_maos.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_maos.c b/src/mesa/drivers/dri/r300/r300_maos.c index 946eb31f0c..4decd1e6a2 100644 --- a/src/mesa/drivers/dri/r300/r300_maos.c +++ b/src/mesa/drivers/dri/r300/r300_maos.c @@ -254,7 +254,7 @@ void r300EmitArrays(GLcontext * ctx, GLboolean immd) exit(-1); \ } \ \ - if (rmesa->current_vp == NULL) \ + if (VERTPROG_ACTIVE(ctx) == GL_FALSE) \ rmesa->state.aos[nr-1].aos_reg = aa_vap_reg++; \ rmesa->state.aos[nr-1].aos_format = f; \ if (immd) { \ @@ -272,7 +272,7 @@ void r300EmitArrays(GLcontext * ctx, GLboolean immd) } \ } - if (rmesa->current_vp != NULL && ctx->VertexProgram._Enabled) { + if (VERTPROG_ACTIVE(ctx)) { 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 && ctx->VertexProgram._Enabled) + if (VERTPROG_ACTIVE(ctx)) outputs = rmesa->current_vp->outputs; else outputs = inputs; |