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

nvk: Re-arrange nir_lower_explicit_io a bit

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand
2023-01-30 20:11:48 -06:00
committed by Marge Bot
parent 0c775223da
commit 1b7ff4b62c
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/vulkan/nvk_shader.c
+3 -5
View File
@@ -81,7 +81,6 @@ nvk_shader_compile_to_nir(struct nvk_device *device,
NIR_PASS(_, nir, nir_split_struct_vars, nir_var_function_temp);
NIR_PASS(_, nir, nir_lower_vars_to_ssa);
NIR_PASS(_, nir, nvk_nir_lower_descriptors, layout, true);
NIR_PASS(_, nir, nir_lower_system_values);
nir_lower_compute_system_values_options csv_options = {
@@ -91,11 +90,11 @@ nvk_shader_compile_to_nir(struct nvk_device *device,
/* Vulkan uses the separate-shader linking model */
nir->info.separate_shader = true;
NIR_PASS(_, nir, nvk_nir_lower_descriptors, layout, true);
NIR_PASS(_, nir, nir_lower_explicit_io, nir_var_mem_ssbo,
nir_address_format_64bit_global_32bit_offset);
spirv_options.ssbo_addr_format);
NIR_PASS(_, nir, nir_lower_explicit_io, nir_var_mem_ubo,
nir_address_format_64bit_global_32bit_offset);
spirv_options.ubo_addr_format);
if (!nir->info.shared_memory_explicit_layout) {
NIR_PASS(_, nir, nir_lower_vars_to_explicit_types,
@@ -104,7 +103,6 @@ nvk_shader_compile_to_nir(struct nvk_device *device,
NIR_PASS(_, nir, nir_lower_explicit_io, nir_var_mem_shared,
nir_address_format_32bit_offset);
NIR_PASS(_, nir, nvk_nir_lower_descriptors, layout, true);
NIR_PASS(_, nir, nir_copy_prop);
NIR_PASS(_, nir, nir_opt_dce);