summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorDanylo Piliaiev <[email protected]>2020-04-20 17:17:53 +0300
committerMarge Bot <[email protected]>2020-04-21 11:16:41 +0000
commit829013d0cad0fa2513b32ae07cf8d745f6e5c62d (patch)
tree7d809afc6dcb7aa63a665efc943531903e00e5a8 /src/mesa
parentae169f38cead48a669d39fcd4ab7747da56e19c2 (diff)
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>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_program.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index fa4dbfbcb8c..54e9debf936 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -535,6 +535,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