From c4e1fd5a7f429c4ba3a10ace3346e2e40cf20361 Mon Sep 17 00:00:00 2001 From: Aapo Tahkola Date: Tue, 19 Apr 2005 03:12:30 +0000 Subject: Fixes for bugs that were nailed down when compairing against software vertex shading. --- src/mesa/drivers/dri/r300/r300_context.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mesa/drivers/dri/r300/r300_context.h') diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h index 13c6fb03b9..3ec5a72a1a 100644 --- a/src/mesa/drivers/dri/r300/r300_context.h +++ b/src/mesa/drivers/dri/r300/r300_context.h @@ -566,8 +566,9 @@ struct r300_vertex_shader_state { int unknown_ptr3; /* pointer within program space */ }; +extern int hw_vertprog_on; #define VERTPROG_ACTIVE(ctx) ( ctx->VertexProgram._Enabled && (R300_CONTEXT(ctx)->current_vp != NULL) && \ - (R300_CONTEXT(ctx)->current_vp->translated) ) + (R300_CONTEXT(ctx)->current_vp->translated) && hw_vertprog_on) /* r300_vertex_shader_state and r300_vertex_program should probably be merged together someday. * Keeping them them seperate for now should ensure fixed pipeline keeps functioning properly. -- cgit v1.2.3