fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

radeonsi: stop setting si_shader_info::output_semantic for FS

Browse source 
FS doesn't use it anymore.

Acked-by: Pierre-Eric
Acked-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40556>
This commit is contained in:
Marek Olšák 2026-03-19 21:12:55 -04:00 • committed by Marge Bot
parent b60acfc5fb
commit debedefbeb
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gallium/drivers/radeonsi/si_shader_info.c
View file

@ -252,12 +252,14 @@ static void gather_io_instrinsic(const nir_shader *nir, struct si_shader_info *i
}
}
/* No 2 outputs can use the same driver location. */
assert((info->output_semantic[loc] == slot_semantic ||
info->output_semantic[loc] == NUM_TOTAL_VARYING_SLOTS) &&
"nir_recompute_io_bases wasn't called");
if (nir->info.stage != MESA_SHADER_FRAGMENT) {
/* No 2 outputs can use the same driver location. */
assert((info->output_semantic[loc] == slot_semantic ||
info->output_semantic[loc] == NUM_TOTAL_VARYING_SLOTS) &&
"nir_recompute_io_bases wasn't called");
info->output_semantic[loc] = slot_semantic;
info->output_semantic[loc] = slot_semantic;
}
if (!is_output_load && mask) {
/* Output stores. */
@ -759,9 +761,11 @@ void si_nir_gather_info(struct si_screen *sscreen, struct nir_shader *nir,
assert(info->input_semantic[i] != NUM_TOTAL_VARYING_SLOTS &&
"nir_recompute_io_bases wasn't called");
}
for (unsigned i = 0; i < info->num_outputs; i++) {
assert(info->output_semantic[i] != NUM_TOTAL_VARYING_SLOTS &&
"nir_recompute_io_bases wasn't called");
if (nir->info.stage != MESA_SHADER_FRAGMENT) {
for (unsigned i = 0; i < info->num_outputs; i++) {
assert(info->output_semantic[i] != NUM_TOTAL_VARYING_SLOTS &&
"nir_recompute_io_bases wasn't called");
}
}
if (nir->info.stage == MESA_SHADER_FRAGMENT) {

2
src/gallium/drivers/radeonsi/si_shader_info.h
View file

@ -92,7 +92,7 @@ struct si_shader_info {
uint8_t num_inputs;
uint8_t num_outputs;
uint8_t input_semantic[PIPE_MAX_SHADER_INPUTS];
uint8_t output_semantic[PIPE_MAX_SHADER_OUTPUTS];
uint8_t output_semantic[PIPE_MAX_SHADER_OUTPUTS]; /* unset for FS */
uint8_t num_vs_inputs;
uint8_t num_vbos_in_user_sgprs;