Module: Mesa Branch: staging/20.0 Commit: 5ac0076928f8c5cd92acb0c047fe3d6c8700c7b1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ac0076928f8c5cd92acb0c047fe3d6c8700c7b1
Author: Danylo Piliaiev <[email protected]> Date: Mon Apr 20 17:17:53 2020 +0300 st/mesa: Re-assign vs in locations after updating nir info for ffvp/ARB_vp After call to nir_shader_gather_info - inputs_read may have changed so st_nir_assign_vs_in_locations should be called for shader to remain in sync with vbo state. Fixes piglit tests: gl-1.0-fpexceptions gl-1.1-color-material-unused-normal-array arb_vertex_program-unused-attributes regression on several gallium drivers. Fixes: d684fb37bfbc47d098158cb03c0672119a4469fe Signed-off-by: Danylo Piliaiev <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4645> (cherry picked from commit 829013d0cad0fa2513b32ae07cf8d745f6e5c62d) --- .pick_status.json | 2 +- src/mesa/state_tracker/st_program.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index d208e9b39a3..2a2a1df09f3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -778,7 +778,7 @@ "description": "st/mesa: Re-assign vs in locations after updating nir info for ffvp/ARB_vp", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "d684fb37bfbc47d098158cb03c0672119a4469fe" }, diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 698ac07a212..6585945f343 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -529,6 +529,7 @@ st_translate_vertex_program(struct st_context *st, */ nir_shader_gather_info(stp->Base.nir, nir_shader_get_entrypoint(stp->Base.nir)); + st_nir_assign_vs_in_locations(stp->Base.nir); stp->Base.info = stp->Base.nir->info; /* For st_draw_feedback, we need to generate TGSI too if draw doesn't _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
