summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2011-08-19 11:42:50 -0700
committerEric Anholt <eric@anholt.net>2011-08-30 12:09:40 -0700
commit2f82c33deefba61b3e72edb4375850c0629af224 (patch)
tree959b0368755285bea9c6e2b085331dd0fa976452
parent1995d1e2070f8cda9e2ce489c694e0949749c8cb (diff)
i965/vs: Move the flag for whether to use the new backend to the context.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.c2
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.h1
-rw-r--r--src/mesa/drivers/dri/i965/brw_vs.c6
3 files changed, 4 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 898ad8a83e8..6c2e3e4c770 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -248,6 +248,8 @@ GLboolean brwCreateContext( int api,
brw_draw_init( brw );
+ brw->new_vs_backend = (getenv("INTEL_NEW_VS") != NULL);
+
return GL_TRUE;
}
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index df63fe1d52c..e936a889960 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -523,6 +523,7 @@ struct brw_context
GLboolean has_negative_rhw_bug;
GLboolean has_aa_line_parameters;
GLboolean has_pln;
+ GLboolean new_vs_backend;
struct {
struct brw_state_flags dirty;
diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c
index f3a394bc62b..3fb389aa407 100644
--- a/src/mesa/drivers/dri/i965/brw_vs.c
+++ b/src/mesa/drivers/dri/i965/brw_vs.c
@@ -54,7 +54,6 @@ do_vs_prog(struct brw_context *brw,
void *mem_ctx;
int aux_size;
int i;
- static int new_vs = -1;
memset(&c, 0, sizeof(c));
memcpy(&c.key, key, sizeof(*key));
@@ -90,10 +89,7 @@ do_vs_prog(struct brw_context *brw,
/* Emit GEN4 code.
*/
- if (new_vs == -1)
- new_vs = getenv("INTEL_NEW_VS") != NULL;
-
- if (new_vs && prog) {
+ if (brw->new_vs_backend && prog) {
if (!brw_vs_emit(prog, &c)) {
ralloc_free(mem_ctx);
return false;