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

nvk: Enable shader bounds checking when nullDescriptor is enabled

Browse source 
Fixes: c9eac89da8 ("nvk: Advertise VK_EXT_robustness2")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30663>
This commit is contained in:
Faith Ekstrand 2024-08-14 10:57:20 -05:00 • committed by Marge Bot
parent 8445190663
commit 85a70bbc05
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/nouveau/vulkan/nvk_shader.c
View file

@ -120,6 +120,9 @@ nvk_ubo_addr_format(const struct nvk_physical_device *pdev,
{
if (nvk_use_bindless_cbuf(&pdev->info)) {
return nir_address_format_vec2_index_32bit_offset;
} else if (rs->null_uniform_buffer_descriptor) {
/* We need bounds checking for null descriptors */
return nir_address_format_64bit_bounded_global;
} else {
switch (rs->uniform_buffers) {
case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT:
@ -137,14 +140,19 @@ nir_address_format
nvk_ssbo_addr_format(const struct nvk_physical_device *pdev,
const struct vk_pipeline_robustness_state *rs)
{
switch (rs->storage_buffers) {
case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT:
return nir_address_format_64bit_global_32bit_offset;
case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT:
case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT:
if (rs->null_storage_buffer_descriptor) {
/* We need bounds checking for null descriptors */
return nir_address_format_64bit_bounded_global;
default:
unreachable("Invalid robust buffer access behavior");
} else {
switch (rs->storage_buffers) {
case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT:
return nir_address_format_64bit_global_32bit_offset;
case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT:
case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT:
return nir_address_format_64bit_bounded_global;
default:
unreachable("Invalid robust buffer access behavior");
}
}
}