intel/compiler: Change dg2_plus check to devinfo->verx10 >= 125

Less special casing and possibly more future-proof.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17990>
This commit is contained in:
Kenneth Graunke
2022-08-09 14:02:16 -07:00
committed by Marge Bot
parent 0210a4d7b9
commit d689ef7482

View File

@@ -6643,13 +6643,12 @@ fs_visitor::set_tcs_invocation_id()
struct brw_tcs_prog_data *tcs_prog_data = brw_tcs_prog_data(prog_data);
struct brw_vue_prog_data *vue_prog_data = &tcs_prog_data->base;
const bool dg2_plus =
devinfo->ver > 12 || intel_device_info_is_dg2(devinfo);
const unsigned instance_id_mask =
dg2_plus ? INTEL_MASK(7, 0) :
(devinfo->ver >= 11) ? INTEL_MASK(22, 16) : INTEL_MASK(23, 17);
(devinfo->verx10 >= 125) ? INTEL_MASK(7, 0) :
(devinfo->ver >= 11) ? INTEL_MASK(22, 16) :
INTEL_MASK(23, 17);
const unsigned instance_id_shift =
dg2_plus ? 0 : (devinfo->ver >= 11) ? 16 : 17;
(devinfo->verx10 >= 125) ? 0 : (devinfo->ver >= 11) ? 16 : 17;
/* Get instance number from g0.2 bits:
* * 7:0 on DG2+