summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r300/r300_context.h
diff options
context:
space:
mode:
authorAapo Tahkola <aet@rasterburn.org>2005-04-19 03:12:30 +0000
committerAapo Tahkola <aet@rasterburn.org>2005-04-19 03:12:30 +0000
commitc4e1fd5a7f429c4ba3a10ace3346e2e40cf20361 (patch)
tree7d12990518695876797f0c33f1077ea88dcdb0a8 /src/mesa/drivers/dri/r300/r300_context.h
parentf8ed0aa26804558cb732f6ea41fe0ebe3da91efe (diff)
Fixes for bugs that were nailed down when compairing against software vertex shading.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_context.h')
-rw-r--r--src/mesa/drivers/dri/r300/r300_context.h3
1 files changed, 2 insertions, 1 deletions
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.