From 829013d0cad0fa2513b32ae07cf8d745f6e5c62d Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Mon, 20 Apr 2020 17:17:53 +0300 Subject: [PATCH] st/mesa: Re-assign vs in locations after updating nir info for ffvp/ARB_vp MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Marek Olšák Part-of: --- src/mesa/state_tracker/st_program.c | 1 + 1 file changed, 1 insertion(+) 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 -- 2.30.2