AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/st: Drop the attrib remapping in st_prepare_vertex_program().

Browse Source 
This was only used in the GLSL-to-TGSI path, which is no longer.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8044>
This commit is contained in:
Emma Anholt
2022-04-08 11:07:13 -07:00
committed by Marge Bot
parent 31f5328398
commit c3001eadcf
4 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/state_tracker/st_cb_drawpixels.c
-1
View File
@@ -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"
src/mesa/state_tracker/st_glsl_to_nir.cpp
+1 -1
View File
@@ -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 ||
src/mesa/state_tracker/st_program.c
+3 -12
View File
@@ -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;
}
src/mesa/state_tracker/st_program.h
+1 -1
View File
@@ -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);