fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

spirv2dxil: Don't lower shared/temp to explicit I/O

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23173>
This commit is contained in:
Jesse Natalie 2023-05-19 12:27:07 -07:00 • committed by Marge Bot
parent f121d8fe12
commit f960b37986
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/microsoft/spirv_to_dxil/dxil_spirv_nir.c
View file

@ -60,7 +60,7 @@ spirv_to_nir_options = {
},
.ubo_addr_format = nir_address_format_32bit_index_offset,
.ssbo_addr_format = nir_address_format_32bit_index_offset,
.shared_addr_format = nir_address_format_32bit_offset,
.shared_addr_format = nir_address_format_logical,
.min_ubo_alignment = 256, /* D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT */
.min_ssbo_alignment = 16, /* D3D12_RAW_UAV_SRV_BYTE_ALIGNMENT */
@ -1065,15 +1065,17 @@ dxil_spirv_nir_passes(nir_shader *nir,
NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_mem_ubo | nir_var_mem_ssbo,
nir_address_format_32bit_index_offset);
if (!nir->info.shared_memory_explicit_layout) {
if (nir->info.shared_memory_explicit_layout) {
NIR_PASS_V(nir, nir_lower_vars_to_explicit_types, nir_var_mem_shared,
shared_var_info);
NIR_PASS_V(nir, dxil_nir_split_unaligned_loads_stores, nir_var_mem_shared);
NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_mem_shared, nir_address_format_32bit_offset);
} else {
NIR_PASS_V(nir, nir_split_struct_vars, nir_var_mem_shared);
NIR_PASS_V(nir, dxil_nir_flatten_var_arrays, nir_var_mem_shared);
NIR_PASS_V(nir, dxil_nir_lower_var_bit_size, nir_var_mem_shared,
conf->shader_model_max >= SHADER_MODEL_6_2 ? 16 : 32, 64);
}
NIR_PASS_V(nir, dxil_nir_split_unaligned_loads_stores, nir_var_mem_shared);
NIR_PASS_V(nir, nir_lower_vars_to_scratch, nir_var_function_temp | nir_var_shader_temp,
256 /* arbitrary */, temp_var_info);
NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_mem_shared,
nir_address_format_32bit_offset);
NIR_PASS_V(nir, dxil_nir_lower_int_cubemaps, false);
@ -1131,6 +1133,12 @@ dxil_spirv_nir_passes(nir_shader *nir,
} while (progress);
}
NIR_PASS_V(nir, nir_remove_dead_variables, nir_var_function_temp, NULL);
NIR_PASS_V(nir, nir_split_struct_vars, nir_var_function_temp);
NIR_PASS_V(nir, dxil_nir_flatten_var_arrays, nir_var_function_temp);
NIR_PASS_V(nir, dxil_nir_lower_var_bit_size, nir_var_function_temp,
conf->shader_model_max >= SHADER_MODEL_6_2 ? 16 : 32, 64);
NIR_PASS_V(nir, nir_lower_doubles, NULL, nir->options->lower_doubles_options);
if (conf->declared_read_only_images_as_srvs)