From: Kenneth Graunke Date: Fri, 25 Sep 2015 03:58:05 +0000 (-0700) Subject: i965: Move GS_THREAD_END mlen calculations out of the generator. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bcef2abad7cf255b6ac112b9ebf0ff75e491c968;p=mesa.git i965: Move GS_THREAD_END mlen calculations out of the generator. The visitor was setting a mlen that was wrong for Broadwell, but the generator was ignoring it and doing the right thing regardless. We may as well move the logic fully into the visitor. This will be useful in the next commit as well. Signed-off-by: Kenneth Graunke Reviewed-by: Jordan Justen --- diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp index c7546070bf9..50f96632f7f 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp @@ -505,7 +505,7 @@ vec4_generator::generate_gs_thread_end(vec4_instruction *inst) inst->base_mrf, /* starting mrf reg nr */ src, BRW_URB_WRITE_EOT | inst->urb_write_flags, - devinfo->gen >= 8 ? 2 : 1,/* message len */ + inst->mlen, 0, /* response len */ 0, /* urb destination offset */ BRW_URB_SWIZZLE_INTERLEAVE); 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 3cb1b4c8793..ff5bd989cc3 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp @@ -244,7 +244,7 @@ vec4_gs_visitor::emit_thread_end() emit_shader_time_end(); inst = emit(GS_OPCODE_THREAD_END); inst->base_mrf = base_mrf; - inst->mlen = 1; + inst->mlen = devinfo->gen >= 8 ? 2 : 1; }