From 2301b2e029d1616019478531e00faf89b9582ed0 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sun, 28 Jul 2019 22:31:00 +0200 Subject: [PATCH] radv: Do non-uniform lowering before bool lowering. Since it can introduce comparisons. Fixes: 028ce527395 "radv: Add non-uniform indexing lowering." Reviewed-by: Dave Airlie Reviewed-by: Samuel Pitoiset --- src/amd/vulkan/radv_pipeline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index d722d558a43..86f0dc11089 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -2528,12 +2528,12 @@ void radv_create_shaders(struct radv_pipeline *pipeline, for (int i = 0; i < MESA_SHADER_STAGES; ++i) { if (nir[i]) { - NIR_PASS_V(nir[i], nir_lower_bool_to_int32); NIR_PASS_V(nir[i], nir_lower_non_uniform_access, nir_lower_non_uniform_ubo_access | nir_lower_non_uniform_ssbo_access | nir_lower_non_uniform_texture_access | nir_lower_non_uniform_image_access); + NIR_PASS_V(nir[i], nir_lower_bool_to_int32); } if (radv_can_dump_shader(device, modules[i], false)) -- 2.30.2