AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: Call nir_opt_undef too after nir_opt_varyings.

Browse Source 
Shaders may have undefined output stores after nir_opt_varyings.
These must be optimized out, otherwise they hit an assertion.

Fixes: 17f6ab28cc
Cc: mesa-stable
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34317>
This commit is contained in:
Timur Kristóf
2025-04-01 14:23:46 +02:00
committed by Marge Bot
parent 15d0804670
commit ce2138d73a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/vulkan/radv_pipeline_graphics.c
+4
View File
@@ -1491,9 +1491,11 @@ radv_graphics_shaders_link_varyings_first(struct radv_shader_stage *producer_sta
/* Run algebraic optimizations on shaders that changed. */
if (p & nir_progress_producer) {
radv_optimize_nir_algebraic(producer, false, false);
NIR_PASS(_, producer, nir_opt_undef);
}
if (p & nir_progress_consumer) {
radv_optimize_nir_algebraic(consumer, false, false);
NIR_PASS(_, consumer, nir_opt_undef);
}
}
@@ -1520,9 +1522,11 @@ radv_graphics_shaders_link_varyings_second(struct radv_shader_stage *producer_st
/* Run algebraic optimizations on shaders that changed. */
if (p & nir_progress_producer) {
radv_optimize_nir_algebraic(producer, true, false);
NIR_PASS(_, producer, nir_opt_undef);
}
if (p & nir_progress_consumer) {
radv_optimize_nir_algebraic(consumer, true, false);
NIR_PASS(_, consumer, nir_opt_undef);
}
/* Re-vectorize I/O for stages that output to memory (LDS or VRAM).