From 2070d36cf34542ed705b79817c1735cc3d94f24b Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sun, 11 Apr 2021 16:01:40 +0200 Subject: [PATCH] radv: Do more meta shader lowering. Need this to clean up our generated RT pipeline. Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index a02895cd086..034f4503a3d 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -589,9 +589,6 @@ radv_shader_compile_to_nir(struct radv_device *device, struct vk_shader_module * NIR_PASS_V(nir, nir_propagate_invariant, device->instance->debug_flags & RADV_DEBUG_INVARIANT_GEOM); - NIR_PASS_V(nir, nir_lower_system_values); - NIR_PASS_V(nir, nir_lower_compute_system_values, NULL); - NIR_PASS_V(nir, nir_lower_clip_cull_distance_arrays); NIR_PASS_V(nir, nir_lower_discard_or_demote, @@ -610,6 +607,9 @@ radv_shader_compile_to_nir(struct radv_device *device, struct vk_shader_module * NIR_PASS_V(nir, nir_lower_doubles, NULL, lower_doubles); } + NIR_PASS_V(nir, nir_lower_system_values); + NIR_PASS_V(nir, nir_lower_compute_system_values, NULL); + /* Vulkan uses the separate-shader linking model */ nir->info.separate_shader = true;