From bdedd03b701781c8b71e162f7eb834e6a11105de Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 17 Jan 2012 04:49:04 -0800 Subject: [PATCH] i965: Remove the INTEL_OLD_VS option. Now that we no longer generate Mesa IR from GLSL IR, it's impossible to use the old vertex shader backend for GLSL programs. There's simply no Mesa IR to codegen from. Any attempt to do so would result in immediate GPU hangs, presumably due to the driver uploading an empty program with no EOT message. NOTE: This is a candidate for the 8.0 branch. Signed-off-by: Kenneth Graunke Reviewed-by: Eric Anholt Reviewed-by: Eugeni Dodonov --- src/mesa/drivers/dri/i965/brw_context.c | 10 ++-------- src/mesa/drivers/dri/i965/brw_context.h | 1 - src/mesa/drivers/dri/i965/brw_vs.c | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 558e0770675..eb152f92648 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -367,16 +367,10 @@ brwCreateContext(int api, brw_draw_init( brw ); - brw->new_vs_backend = (getenv("INTEL_OLD_VS") == NULL); brw->precompile = driQueryOptionb(&intel->optionCache, "shader_precompile"); - /* If we're using the new shader backend, we require integer uniforms - * stored as actual integers. - */ - if (brw->new_vs_backend) { - ctx->Const.NativeIntegers = true; - ctx->Const.UniformBooleanTrue = 1; - } + ctx->Const.NativeIntegers = true; + ctx->Const.UniformBooleanTrue = 1; return true; } diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 9f9b11313ec..c027beff3d6 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -645,7 +645,6 @@ struct brw_context bool has_negative_rhw_bug; bool has_aa_line_parameters; bool has_pln; - bool new_vs_backend; bool precompile; struct { diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index 7fc7dcca5a3..a2bce27b098 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -231,7 +231,7 @@ do_vs_prog(struct brw_context *brw, /* Emit GEN4 code. */ - if (brw->new_vs_backend && prog) { + if (prog) { if (!brw_vs_emit(prog, &c)) { ralloc_free(mem_ctx); return false; -- 2.30.2