radeonsi: remove unused output_type and output_usage from si_shader_info
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Acked-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35529>
diff --git a/src/gallium/drivers/radeonsi/si_shader_info.c b/src/gallium/drivers/radeonsi/si_shader_info.c
index 069cb2a..f3e4871 100644
--- a/src/gallium/drivers/radeonsi/si_shader_info.c
+++ b/src/gallium/drivers/radeonsi/si_shader_info.c
@@ -139,8 +139,6 @@
}
} else {
/* Outputs. */
- assert(driver_location + num_slots <= ARRAY_SIZE(info->output_usagemask));
-
for (unsigned i = 0; i < num_slots; i++) {
unsigned loc = driver_location + i;
unsigned slot_semantic = semantic + i;
@@ -174,15 +172,6 @@
}
info->gs_writes_stream0 |= writes_stream0;
-
- if (nir_intrinsic_has_src_type(intr))
- info->output_type[loc] = nir_intrinsic_src_type(intr);
- else if (nir_intrinsic_has_dest_type(intr))
- info->output_type[loc] = nir_intrinsic_dest_type(intr);
- else
- info->output_type[loc] = nir_type_float32;
-
- info->output_usagemask[loc] |= mask;
info->num_outputs = MAX2(info->num_outputs, loc + 1);
if (nir->info.stage == MESA_SHADER_VERTEX ||
@@ -578,8 +567,6 @@
* and si_emit_spi_map uses this unconditionally when such a pixel shader is used.
*/
info->output_semantic[info->num_outputs] = VARYING_SLOT_PRIMITIVE_ID;
- info->output_type[info->num_outputs] = nir_type_uint32;
- info->output_usagemask[info->num_outputs] = 0x1;
}
if (nir->info.stage == MESA_SHADER_FRAGMENT) {
diff --git a/src/gallium/drivers/radeonsi/si_shader_info.h b/src/gallium/drivers/radeonsi/si_shader_info.h
index 3412cf4..e4be9d7 100644
--- a/src/gallium/drivers/radeonsi/si_shader_info.h
+++ b/src/gallium/drivers/radeonsi/si_shader_info.h
@@ -91,8 +91,6 @@
uint8_t num_outputs;
struct si_vs_tcs_input_info input[PIPE_MAX_SHADER_INPUTS];
uint8_t output_semantic[PIPE_MAX_SHADER_OUTPUTS];
- uint8_t output_usagemask[PIPE_MAX_SHADER_OUTPUTS];
- uint8_t output_type[PIPE_MAX_SHADER_OUTPUTS]; /* enum nir_alu_type */
uint8_t num_vs_inputs;
uint8_t num_vbos_in_user_sgprs;
