diff options
| author | Aapo Tahkola <aet@rasterburn.org> | 2005-03-17 21:50:01 +0000 |
|---|---|---|
| committer | Aapo Tahkola <aet@rasterburn.org> | 2005-03-17 21:50:01 +0000 |
| commit | a78bbd0816a894a366bf3824fbbfbc5c794cd61d (patch) | |
| tree | 81d09667294cf4b600f691c4e5f6a48f08d9bc90 /src/mesa/drivers/dri/r300/r300_state.c | |
| parent | 80a939cafb7a67837a9fc82e45b5ec85c5912a06 (diff) | |
Simple TCL stage and ability to disable vps.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 716f62346a..c10e5dbf96 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -1435,7 +1435,7 @@ void r300_setup_rs_unit(GLcontext *ctx) cur_reg = 0; r300->hw.rr.cmd[R300_RR_ROUTE_0] = 0; - if (r300->current_vp != NULL) + if (r300->current_vp != NULL && ctx->VertexProgram._Enabled) vap_outputs = r300->current_vp->outputs; else vap_outputs = r300->state.render_inputs; @@ -1693,7 +1693,7 @@ void r300SetupVertexShader(r300ContextPtr rmesa) 0x400 area might have something to do with pixel shaders as it appears right after pfs programming. 0x406 is set to { 0.0, 0.0, 1.0, 0.0 } most of the time but should change with smooth points and in other rare cases. */ //setup_vertex_shader_fragment(rmesa, 0x406, &unk4); - if(rmesa->current_vp != NULL){ + if(rmesa->current_vp != NULL && ctx->VertexProgram._Enabled){ r300SetupVertexProgram(rmesa); return ; } |