OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: Update shader info of ffvp/ARB_vp after translation to NIR

Browse Source 
We must update stp->Base.info after translation and before
st_prepare_vertex_program is called, because inputs_read
may become outdated after NIR optimization passes.

For ffvp/ARB_vp inputs_read is populated based on declared
attributes without taking their usage into consideration.
When creating shader variants we expect that their inputs_read
would match the base ones for input mapping to work properly.

Cc: <mesa-stable@lists.freedesktop.org>
Fixes: 8a0dd0af3f
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2758
Signed-off-by: Danylo Piliaiev <danylo.piliaiev@globallogic.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4598>
This commit is contained in:
Danylo Piliaiev
2020-04-16 16:34:25 +03:00
parent c4ca9e66dd
commit d684fb37bf
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/mesa/state_tracker/st_program.c
View File

@@ -491,8 +491,6 @@ st_translate_vertex_program(struct st_context *st,
if (stp->Base.arb.IsPositionInvariant)
_mesa_insert_mvp_code(st->ctx, &stp->Base);
st_prepare_vertex_program(stp);
/* ARB_vp: */
if (!stp->glsl_to_tgsi) {
_mesa_remove_output_reads(&stp->Base, PROGRAM_OUTPUT);
@@ -524,14 +522,33 @@ st_translate_vertex_program(struct st_context *st,
stp->state.type = PIPE_SHADER_IR_NIR;
stp->Base.nir = st_translate_prog_to_nir(st, &stp->Base,
MESA_SHADER_VERTEX);
/* We must update stp->Base.info after translation and before
* st_prepare_vertex_program is called, because inputs_read
* may become outdated after NIR optimization passes.
*
* For ffvp/ARB_vp inputs_read is populated based
* on declared attributes without taking their usage into
* consideration. When creating shader variants we expect
* that their inputs_read would match the base ones for
* input mapping to work properly.
*/
nir_shader_gather_info(stp->Base.nir,
nir_shader_get_entrypoint(stp->Base.nir));
stp->Base.info = stp->Base.nir->info;
/* For st_draw_feedback, we need to generate TGSI too if draw doesn't
* use LLVM.
*/
if (draw_has_llvm())
if (draw_has_llvm()) {
st_prepare_vertex_program(stp);
return true;
}
}
}
st_prepare_vertex_program(stp);
/* Get semantic names and indices. */
for (attr = 0; attr < VARYING_SLOT_MAX; attr++) {
if (stp->Base.info.outputs_written & BITFIELD64_BIT(attr)) {