From 074d472398b3cc7f32fe5c0cc742853cf66fabed Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 30 Jun 2014 09:04:26 -0700 Subject: [PATCH] i965: Switch to the EU emit layer for code generation on Broadwell. Everything should be in place to unify code generation between Gen4-7 and Gen8+. We should be able to drop the Gen8 generators at this point. However, leave them hooked up for a brief moment, for testing and comparison purposes. Set GEN8=1 to use the old Gen8+ code generator paths. Signed-off-by: Kenneth Graunke Reviewed-by: Chris Forbes Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vec4.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 3aee82226e0..4aaba8ff16c 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -3245,7 +3245,7 @@ brw_wm_fs_emit(struct brw_context *brw, } const unsigned *assembly = NULL; - if (brw->gen >= 8) { + if (brw->gen >= 8 && getenv("GEN8") != NULL) { gen8_fs_generator g(brw, mem_ctx, key, prog_data, prog, fp, v.do_dual_src); assembly = g.generate_assembly(&v.instructions, simd16_instructions, final_assembly_size); diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index 9a73f8fa1a6..8eae61d6e9e 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -1794,7 +1794,7 @@ brw_vs_emit(struct brw_context *brw, } const unsigned *assembly = NULL; - if (brw->gen >= 8) { + if (brw->gen >= 8 && getenv("GEN8") != NULL) { gen8_vec4_generator g(brw, prog, &c->vp->program.Base, &prog_data->base, mem_ctx, INTEL_DEBUG & DEBUG_VS); assembly = g.generate_assembly(&v.instructions, final_assembly_size); diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp index 75ea9a265d5..313bdbe5067 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp @@ -615,7 +615,7 @@ generate_assembly(struct brw_context *brw, exec_list *instructions, unsigned *final_assembly_size) { - if (brw->gen >= 8) { + if (brw->gen >= 8 && getenv("GEN8") != NULL) { gen8_vec4_generator g(brw, shader_prog, prog, prog_data, mem_ctx, INTEL_DEBUG & DEBUG_GS); return g.generate_assembly(instructions, final_assembly_size); -- 2.30.2