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

zink: run lower_io_to_scalar before rewriting bo access

Browse source 
this is happening in ntv anyway, so move it to the compiler here

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13484>
This commit is contained in:
Mike Blumenkrantz 2021-10-20 11:03:00 -04:00 • committed by Marge Bot
parent ee22cd619f
commit 3a1ecd1e8c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/zink/zink_compiler.c
View file

@ -898,8 +898,10 @@ zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs, nir_shad
default: break; default: break;
} }
} }
if (screen->driconf.inline_uniforms) if (screen->driconf.inline_uniforms) {
NIR_PASS_V(nir, nir_lower_io_to_scalar, nir_var_mem_ubo | nir_var_mem_ssbo | nir_var_mem_shared);
NIR_PASS_V(nir, rewrite_bo_access); NIR_PASS_V(nir, rewrite_bo_access);
}
if (inlined_uniforms) { if (inlined_uniforms) {
optimize_nir(nir); optimize_nir(nir);
@ -1413,8 +1415,10 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir,
NIR_PASS_V(nir, lower_64bit_vertex_attribs); NIR_PASS_V(nir, lower_64bit_vertex_attribs);
NIR_PASS_V(nir, unbreak_bos); NIR_PASS_V(nir, unbreak_bos);
/* run in compile if there could be inlined uniforms */ /* run in compile if there could be inlined uniforms */
if (!screen->driconf.inline_uniforms) if (!screen->driconf.inline_uniforms) {
NIR_PASS_V(nir, nir_lower_io_to_scalar, nir_var_mem_ubo | nir_var_mem_ssbo | nir_var_mem_shared);
NIR_PASS_V(nir, rewrite_bo_access); NIR_PASS_V(nir, rewrite_bo_access);
}
if (zink_debug & ZINK_DEBUG_NIR) { if (zink_debug & ZINK_DEBUG_NIR) {
fprintf(stderr, "NIR shader:\n---8<---\n"); fprintf(stderr, "NIR shader:\n---8<---\n");