Module: Mesa Branch: main Commit: 526f7d779071e432a1205d62acd81d8d7f0c2f47 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=526f7d779071e432a1205d62acd81d8d7f0c2f47
Author: Erik Faye-Lund <[email protected]> Date: Mon Aug 23 14:11:52 2021 +0200 gallium/tgsi: rip out cylindrical wrap from ureg We always pass zero to these arguments, so this feature isn't in use. Acked-by: Roland Scheidegger <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12505> --- src/gallium/auxiliary/nir/nir_to_tgsi.c | 17 ++++++++--------- src/gallium/auxiliary/tgsi/tgsi_ureg.c | 22 ++++++++++------------ src/gallium/auxiliary/tgsi/tgsi_ureg.h | 10 ++++------ src/gallium/frontends/nine/nine_shader.c | 7 +++---- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 ++-- 5 files changed, 27 insertions(+), 33 deletions(-) diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi.c b/src/gallium/auxiliary/nir/nir_to_tgsi.c index 135793dbde7..98b25ac1c27 100644 --- a/src/gallium/auxiliary/nir/nir_to_tgsi.c +++ b/src/gallium/auxiliary/nir/nir_to_tgsi.c @@ -360,15 +360,14 @@ ntt_setup_inputs(struct ntt_compile *c) uint32_t usage_mask = ntt_tgsi_var_usage_mask(var); - decl = ureg_DECL_fs_input_cyl_centroid_layout(c->ureg, - semantic_name, - semantic_index, - interpolation, - 0, - sample_loc, - var->data.driver_location, - usage_mask, - array_id, array_len); + decl = ureg_DECL_fs_input_centroid_layout(c->ureg, + semantic_name, + semantic_index, + interpolation, + sample_loc, + var->data.driver_location, + usage_mask, + array_id, array_len); if (semantic_name == TGSI_SEMANTIC_FACE) { struct ureg_dst temp = ureg_DECL_temporary(c->ureg); diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.c b/src/gallium/auxiliary/tgsi/tgsi_ureg.c index 0bf10fd039f..3dfc0205eb8 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_ureg.c +++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.c @@ -284,11 +284,10 @@ ureg_property(struct ureg_program *ureg, unsigned name, unsigned value) } struct ureg_src -ureg_DECL_fs_input_cyl_centroid_layout(struct ureg_program *ureg, +ureg_DECL_fs_input_centroid_layout(struct ureg_program *ureg, enum tgsi_semantic semantic_name, unsigned semantic_index, enum tgsi_interpolate_mode interp_mode, - unsigned cylindrical_wrap, enum tgsi_interpolate_loc interp_location, unsigned index, unsigned usage_mask, @@ -304,7 +303,7 @@ ureg_DECL_fs_input_cyl_centroid_layout(struct ureg_program *ureg, if (ureg->input[i].semantic_name == semantic_name && ureg->input[i].semantic_index == semantic_index) { assert(ureg->input[i].interp == interp_mode); - assert(ureg->input[i].cylindrical_wrap == cylindrical_wrap); + assert(ureg->input[i].cylindrical_wrap == 0); assert(ureg->input[i].interp_location == interp_location); if (ureg->input[i].array_id == array_id) { ureg->input[i].usage_mask |= usage_mask; @@ -319,7 +318,7 @@ ureg_DECL_fs_input_cyl_centroid_layout(struct ureg_program *ureg, ureg->input[i].semantic_name = semantic_name; ureg->input[i].semantic_index = semantic_index; ureg->input[i].interp = interp_mode; - ureg->input[i].cylindrical_wrap = cylindrical_wrap; + ureg->input[i].cylindrical_wrap = 0; ureg->input[i].interp_location = interp_location; ureg->input[i].first = index; ureg->input[i].last = index + array_size - 1; @@ -337,18 +336,17 @@ out: } struct ureg_src -ureg_DECL_fs_input_cyl_centroid(struct ureg_program *ureg, +ureg_DECL_fs_input_centroid(struct ureg_program *ureg, enum tgsi_semantic semantic_name, unsigned semantic_index, enum tgsi_interpolate_mode interp_mode, - unsigned cylindrical_wrap, enum tgsi_interpolate_loc interp_location, unsigned array_id, unsigned array_size) { - return ureg_DECL_fs_input_cyl_centroid_layout(ureg, + return ureg_DECL_fs_input_centroid_layout(ureg, semantic_name, semantic_index, interp_mode, - cylindrical_wrap, interp_location, + interp_location, ureg->nr_input_regs, TGSI_WRITEMASK_XYZW, array_id, array_size); } @@ -374,9 +372,9 @@ ureg_DECL_input_layout(struct ureg_program *ureg, unsigned array_id, unsigned array_size) { - return ureg_DECL_fs_input_cyl_centroid_layout(ureg, + return ureg_DECL_fs_input_centroid_layout(ureg, semantic_name, semantic_index, - TGSI_INTERPOLATE_CONSTANT, 0, TGSI_INTERPOLATE_LOC_CENTER, + TGSI_INTERPOLATE_CONSTANT, TGSI_INTERPOLATE_LOC_CENTER, index, usage_mask, array_id, array_size); } @@ -388,8 +386,8 @@ ureg_DECL_input(struct ureg_program *ureg, unsigned array_id, unsigned array_size) { - return ureg_DECL_fs_input_cyl_centroid(ureg, semantic_name, semantic_index, - TGSI_INTERPOLATE_CONSTANT, 0, + return ureg_DECL_fs_input_centroid(ureg, semantic_name, semantic_index, + TGSI_INTERPOLATE_CONSTANT, TGSI_INTERPOLATE_LOC_CENTER, array_id, array_size); } diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.h b/src/gallium/auxiliary/tgsi/tgsi_ureg.h index 5b8fbca49ad..343708b6c09 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_ureg.h +++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.h @@ -172,11 +172,10 @@ ureg_property(struct ureg_program *ureg, unsigned name, unsigned value); */ struct ureg_src -ureg_DECL_fs_input_cyl_centroid_layout(struct ureg_program *, +ureg_DECL_fs_input_centroid_layout(struct ureg_program *, enum tgsi_semantic semantic_name, unsigned semantic_index, enum tgsi_interpolate_mode interp_mode, - unsigned cylindrical_wrap, enum tgsi_interpolate_loc interp_location, unsigned index, unsigned usage_mask, @@ -184,11 +183,10 @@ ureg_DECL_fs_input_cyl_centroid_layout(struct ureg_program *, unsigned array_size); struct ureg_src -ureg_DECL_fs_input_cyl_centroid(struct ureg_program *, +ureg_DECL_fs_input_centroid(struct ureg_program *, enum tgsi_semantic semantic_name, unsigned semantic_index, enum tgsi_interpolate_mode interp_mode, - unsigned cylindrical_wrap, enum tgsi_interpolate_loc interp_location, unsigned array_id, unsigned array_size); @@ -199,11 +197,11 @@ ureg_DECL_fs_input(struct ureg_program *ureg, unsigned semantic_index, enum tgsi_interpolate_mode interp_mode) { - return ureg_DECL_fs_input_cyl_centroid(ureg, + return ureg_DECL_fs_input_centroid(ureg, semantic_name, semantic_index, interp_mode, - 0, TGSI_INTERPOLATE_LOC_CENTER, 0, 1); + TGSI_INTERPOLATE_LOC_CENTER, 0, 1); } struct ureg_src diff --git a/src/gallium/frontends/nine/nine_shader.c b/src/gallium/frontends/nine/nine_shader.c index 613fe1ff3b6..170084cfb2c 100644 --- a/src/gallium/frontends/nine/nine_shader.c +++ b/src/gallium/frontends/nine/nine_shader.c @@ -1047,9 +1047,9 @@ tx_src_param(struct shader_translator *tx, const struct sm1_src_param *param) src = ureg_src_register(TGSI_FILE_INPUT, param->idx); } else { if (tx->version.major < 3) { - src = ureg_DECL_fs_input_cyl_centroid( + src = ureg_DECL_fs_input_centroid( ureg, TGSI_SEMANTIC_COLOR, param->idx, - TGSI_INTERPOLATE_COLOR, 0, + TGSI_INTERPOLATE_COLOR, tx->info->force_color_in_centroid ? TGSI_INTERPOLATE_LOC_CENTROID : 0, 0, 1); @@ -2327,10 +2327,9 @@ DECL_SPECIAL(DCL) (tgsi.Name == TGSI_SEMANTIC_COLOR && tx->info->force_color_in_centroid)) interp_location = TGSI_INTERPOLATE_LOC_CENTROID; - tx->regs.v[sem.reg.idx] = ureg_DECL_fs_input_cyl_centroid( + tx->regs.v[sem.reg.idx] = ureg_DECL_fs_input_centroid( ureg, tgsi.Name, tgsi.Index, nine_tgsi_to_interp_mode(&tgsi), - 0, /* cylwrap */ interp_location, 0, 1); } else if (!is_input && 0) { /* declare in COLOROUT/DEPTHOUT case */ diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 3ecdb8374b0..801aff3de6f 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -6738,10 +6738,10 @@ st_translate_program( interp_location = (enum tgsi_interpolate_loc) decl->interp_loc; } - src = ureg_DECL_fs_input_cyl_centroid_layout(ureg, + src = ureg_DECL_fs_input_centroid_layout(ureg, (enum tgsi_semantic) inputSemanticName[slot], inputSemanticIndex[slot], - interp_mode, 0, interp_location, slot, tgsi_usage_mask, + interp_mode, interp_location, slot, tgsi_usage_mask, decl->array_id, decl->size); for (unsigned j = 0; j < decl->size; ++j) {
