From: Topi Pohjolainen Date: Tue, 16 Oct 2018 11:56:51 +0000 (-0400) Subject: intel/compiler/icl: Use invocation id bits 22:16 instead of 23:17 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a11cafbd7af1980a277ffbca00acb0b1f7f25309;p=mesa.git intel/compiler/icl: Use invocation id bits 22:16 instead of 23:17 Identifier bits in the dispatch header have changed. See Bspec: SINGLE_PATCH Payload: 3D Pipeline Stages - 3D Pipeline Geometry - Hull Shader (HS) Stage IVB+ - Payloads IVB+ Fixes: KHR-GL46.tessellation_shader.tessellation_shader_tc_barriers.barrier_guarded_read_write_calls Reviewed-by: Anuj Phogat Signed-off-by: Topi Pohjolainen --- diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index 69726ed70e8..e030f7215ce 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -6599,14 +6599,18 @@ fs_visitor::run_tcs_single_patch() if (tcs_prog_data->instances == 1) { invocation_id = channels_ud; } else { + const unsigned invocation_id_mask = devinfo->gen >= 11 ? + INTEL_MASK(22, 16) : INTEL_MASK(23, 17); + const unsigned invocation_id_shift = devinfo->gen >= 11 ? 16 : 17; + invocation_id = bld.vgrf(BRW_REGISTER_TYPE_UD); /* Get instance number from g0.2 bits 23:17, and multiply it by 8. */ fs_reg t = bld.vgrf(BRW_REGISTER_TYPE_UD); fs_reg instance_times_8 = bld.vgrf(BRW_REGISTER_TYPE_UD); bld.AND(t, fs_reg(retype(brw_vec1_grf(0, 2), BRW_REGISTER_TYPE_UD)), - brw_imm_ud(INTEL_MASK(23, 17))); - bld.SHR(instance_times_8, t, brw_imm_ud(17 - 3)); + brw_imm_ud(invocation_id_mask)); + bld.SHR(instance_times_8, t, brw_imm_ud(invocation_id_shift - 3)); bld.ADD(invocation_id, instance_times_8, channels_ud); }