fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/glsl_to_nir: call gl_nir_lower_buffers() a little later

Browse source 
In a following commit we will use a NIR based builder to build the
OpenGL resource list, so we want to delay this call a little.

Ack-by: Alejandro Piñeiro <apinheiro@igalia.com>
This commit is contained in:
Timothy Arceri 2019-12-06 21:53:17 +11:00
parent d0259f4159
commit 144f54e483
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/state_tracker/st_glsl_to_nir.cpp
View file

@ -405,7 +405,6 @@ st_nir_preprocess(struct st_context *st, struct gl_program *prog,
nir_var_mem_shared, nir_address_format_32bit_offset);
}
NIR_PASS_V(nir, gl_nir_lower_buffers, shader_program);
/* Do a round of constant folding to clean up address calculations */
NIR_PASS_V(nir, nir_opt_constant_folding);
}
@ -726,6 +725,8 @@ st_link_nir(struct gl_context *ctx,
struct gl_linked_shader *shader = linked_shader[i];
nir_shader *nir = shader->Program->nir;
NIR_PASS_V(nir, gl_nir_lower_buffers, shader_program);
/* Linked shaders are optimized in st_nir_link_shaders. Separate shaders
* and shaders with a fixed-func VS or FS are optimized here.
*/