Module: Mesa Branch: main Commit: c3001eadcfe613c2eb28f015e98d7b33dc1a2ab1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3001eadcfe613c2eb28f015e98d7b33dc1a2ab1
Author: Emma Anholt <[email protected]> Date: Fri Apr 8 11:07:13 2022 -0700 mesa/st: Drop the attrib remapping in st_prepare_vertex_program(). This was only used in the GLSL-to-TGSI path, which is no longer. Reviewed-by: Marek Olšák <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8044> --- src/mesa/state_tracker/st_cb_drawpixels.c | 1 - src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 +- src/mesa/state_tracker/st_program.c | 15 +++------------ src/mesa/state_tracker/st_program.h | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index d7ddef79049..4af6c1e8628 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -67,7 +67,6 @@ #include "pipe/p_context.h" #include "pipe/p_defines.h" -#include "tgsi/tgsi_ureg.h" #include "util/format/u_format.h" #include "util/u_inlines.h" #include "util/u_math.h" diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 38f306afaf7..a5819ea0e4f 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -925,7 +925,7 @@ st_link_nir(struct gl_context *ctx, /* Initialize st_vertex_program members. */ if (shader->Stage == MESA_SHADER_VERTEX) - st_prepare_vertex_program(prog, NULL); + st_prepare_vertex_program(prog); /* Get pipe_stream_output_info. */ if (shader->Stage == MESA_SHADER_VERTEX || diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 90bb1517623..29161c4d557 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -421,29 +421,23 @@ st_translate_prog_to_nir(struct st_context *st, struct gl_program *prog, * input index. */ void -st_prepare_vertex_program(struct gl_program *prog, uint8_t *out_attrib_to_index) +st_prepare_vertex_program(struct gl_program *prog) { struct gl_vertex_program *stvp = (struct gl_vertex_program *)prog; - uint8_t attrib_to_index[VERT_ATTRIB_MAX] = {0}; stvp->num_inputs = 0; stvp->vert_attrib_mask = 0; memset(stvp->result_to_output, ~0, sizeof(stvp->result_to_output)); - /* Determine number of inputs, the mappings between VERT_ATTRIB_x - * and TGSI generic input indexes, plus input attrib semantic info. + /* Determine number of inputs and input attrib semantic info. */ for (unsigned attr = 0; attr < VERT_ATTRIB_MAX; attr++) { if ((prog->info.inputs_read & BITFIELD64_BIT(attr)) != 0) { - attrib_to_index[attr] = stvp->num_inputs; stvp->vert_attrib_mask |= BITFIELD_BIT(attr); stvp->num_inputs++; } } - /* pre-setup potentially unused edgeflag input */ - attrib_to_index[VERT_ATTRIB_EDGEFLAG] = stvp->num_inputs; - /* Compute mapping of vertex program outputs to slots. */ unsigned num_outputs = 0; for (unsigned attr = 0; attr < VARYING_SLOT_MAX; attr++) { @@ -452,9 +446,6 @@ st_prepare_vertex_program(struct gl_program *prog, uint8_t *out_attrib_to_index) } /* pre-setup potentially unused edgeflag output */ stvp->result_to_output[VARYING_SLOT_EDGE] = num_outputs; - - if (out_attrib_to_index) - memcpy(out_attrib_to_index, attrib_to_index, sizeof(attrib_to_index)); } void @@ -615,7 +606,7 @@ st_translate_vertex_program(struct st_context *st, MESA_SHADER_VERTEX); prog->info = prog->nir->info; - st_prepare_vertex_program(prog, NULL); + st_prepare_vertex_program(prog); return true; } diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h index 980cee8880f..da2b9aaf7bc 100644 --- a/src/mesa/state_tracker/st_program.h +++ b/src/mesa/state_tracker/st_program.h @@ -295,7 +295,7 @@ extern void st_finalize_nir_before_variants(struct nir_shader *nir); extern void -st_prepare_vertex_program(struct gl_program *stvp, uint8_t *attrib_to_index); +st_prepare_vertex_program(struct gl_program *stvp); extern void st_translate_stream_output_info(struct gl_program *prog);
