From 148ea4375c2a00250b0faa14ad5e59c7d84d84a0 Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Mon, 26 Jul 2021 12:06:05 +0200
Subject: [PATCH] radv: Implement NULL accel struct descriptor write.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12592>
---
 src/amd/vulkan/radv_descriptor_set.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c
index de8a3ce90d9..df30c4f1148 100644
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -1104,7 +1104,7 @@ static void
 write_accel_struct(void *ptr, VkAccelerationStructureKHR _accel_struct)
 {
    RADV_FROM_HANDLE(radv_acceleration_structure, accel_struct, _accel_struct);
-   uint64_t va = radv_accel_struct_get_va(accel_struct);
+   uint64_t va = accel_struct ? radv_accel_struct_get_va(accel_struct) : 0;
    memcpy(ptr, &va, sizeof(va));
 }