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

radv: Fix gnu-empty-initializer errors in ca9191a8
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Fixes the following building errors:

../src/amd/vulkan/radv_pipeline.c:562:63: error: use of GNU empty initializer extension [-Werror,-Wgnu-empty-initializer]
   NIR_PASS(_, stage->nir, nir_opt_uub, &(nir_opt_uub_options){});
                                                              ^
1 error generated.

../src/amd/vulkan/radv_shader.c:204:80: error: use of GNU empty initializer extension [-Werror,-Wgnu-empty-initializer]
      NIR_LOOP_PASS(progress, skip, shader, nir_opt_uub, &(nir_opt_uub_options){});
                                                                               ^
1 error generated.

Fixes: ca9191a8 ("radv: use nir_opt_uub")
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/42367>
This commit is contained in:
Mauro Rossi 2026-06-21 22:23:59 +02:00
parent 8e7d802c1c
commit 22abfc06d7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/amd/vulkan/radv_pipeline.c
View file

@ -559,7 +559,7 @@ radv_postprocess_nir(const struct radv_compiler_info *compiler_info, const struc
if (opt_intrinsics) /* optimize inot(inverse_ballot) */
NIR_PASS(_, stage->nir, nir_opt_intrinsics);
NIR_PASS(_, stage->nir, nir_opt_uub, &(nir_opt_uub_options){});
NIR_PASS(_, stage->nir, nir_opt_uub, &(nir_opt_uub_options){0});
radv_optimize_nir_algebraic(
stage->nir, io_to_mem || lowered_ngg || stage->stage == MESA_SHADER_COMPUTE || stage->stage == MESA_SHADER_TASK,

2
src/amd/vulkan/radv_shader.c
View file

@ -201,7 +201,7 @@ radv_optimize_nir(struct nir_shader *shader, bool optimize_conservatively)
}
NIR_LOOP_PASS_NOT_IDEMPOTENT(progress, skip, shader, nir_opt_if, nir_opt_if_optimize_phi_true_false);
NIR_LOOP_PASS(progress, skip, shader, nir_opt_cse);
NIR_LOOP_PASS(progress, skip, shader, nir_opt_uub, &(nir_opt_uub_options){});
NIR_LOOP_PASS(progress, skip, shader, nir_opt_uub, &(nir_opt_uub_options){0});
nir_opt_peephole_select_options peephole_select_options = {
.limit = 8,