gpuav: Validate BLAS buffer memory in TLAS build

Author: arno-lunarg

layers/gpuav/shaders/gpuav_error_codes.h

@@ -169,7 +169,8 @@ const int kErrorSubCode_PreBuildAccelerationStructures_BlasAddrAlignment = 1;
 const int kErrorSubCode_PreBuildAccelerationStructures_InvalidAS = 2;
 const int kErrorSubCode_PreBuildAccelerationStructures_DestroyedASBuffer = 3;
 const int kErrorSubCode_PreBuildAccelerationStructures_InvalidASType = 4;
-const int kErrorSubCode_PreBuildAccelerationStructures_BlasMemoryOverlap = 5;
+const int kErrorSubCode_PreBuildAccelerationStructures_DestroyedASMemory = 5;
+const int kErrorSubCode_PreBuildAccelerationStructures_BlasMemoryOverlap = 6;
 
 #ifdef __cplusplus
 }  // namespace glsl

layers/gpuav/shaders/validation_cmd/build_acceleration_structures.comp

@@ -72,10 +72,17 @@ void main() {
 
                 if (GET_BUILD_AS_METADATA_BUFFER_STATUS(as_metadata) != BUILD_AS_METADATA_VALID_BUFFER) {
                     error_subcode = kErrorSubCode_PreBuildAccelerationStructures_DestroyedASBuffer;
+                    break;
                 }
 
                 if (GET_BUILD_AS_METADATA_AS_TYPE(as_metadata) != BUILD_AS_METADATA_AS_TYPE_BLAS) {
                     error_subcode = kErrorSubCode_PreBuildAccelerationStructures_InvalidASType;
+                    break;
+                }
+
+                if (GET_BUILD_AS_METADATA_BUFFER_MEMORY_STATUS(as_metadata) != BUILD_AS_METADATA_VALID_BUFFER_MEMORY) {
+                    error_subcode = kErrorSubCode_PreBuildAccelerationStructures_DestroyedASMemory;
+                    break;
                 }
 
                 break;

layers/gpuav/shaders/validation_cmd/build_acceleration_structures.h

@@ -27,6 +27,10 @@
 #define GET_BUILD_AS_METADATA_AS_TYPE(metadata) ((metadata & (0x3 << 1u)) >> 1u)
 #define SET_BUILD_AS_METADATA_AS_TYPE(as_type) ((uint32_t(as_type) & 0x3) << 1u)
 
+#define BUILD_AS_METADATA_VALID_BUFFER_MEMORY 1u
+#define GET_BUILD_AS_METADATA_BUFFER_MEMORY_STATUS(metadata) ((metadata & (0x1 << 3u)) >> 3u)
+#define SET_BUILD_AS_METADATA_BUFFER_MEMORY_STATUS(is_memory_destroyed) ((uint32_t(is_memory_destroyed) & 0x1) << 3u)
+
 #ifdef __cplusplus
 
 #include <cstdint>

layers/gpuav/validation_cmd/gpuav_ray_tracing.cpp

@@ -455,8 +455,11 @@ void BuildAccelerationStructures(Validator& gpuav, const Location& loc, CommandB
         for (const vvl::AccelerationStructureKHR* as : gpuav.device_state->as_with_addresses.array) {
             as_addresses_ptr[written_count] = as->acceleration_structure_address;
             uint32_t metadata = 0;
-            metadata |= SET_BUILD_AS_METADATA_BUFFER_STATUS(as->buffer_state && !as->buffer_state->Destroyed());
+            const bool is_buffer_destroyed = as->buffer_state && !as->buffer_state->Destroyed();
+            const bool is_buffer_bound_to_memory = is_buffer_destroyed && as->buffer_state->IsMemoryBound();
+            metadata |= SET_BUILD_AS_METADATA_BUFFER_STATUS(is_buffer_destroyed);
             metadata |= SET_BUILD_AS_METADATA_AS_TYPE(as->create_info.type);
+            metadata |= SET_BUILD_AS_METADATA_BUFFER_MEMORY_STATUS(is_buffer_bound_to_memory);
             as_metadatas_ptr[written_count] = metadata;
             const vvl::range<VkDeviceAddress> as_buffer_addr_range = as->GetDeviceAddressRange();
             as_buffer_addr_ranges_ptr[2 * written_count] = as_buffer_addr_range.begin;
@@ -636,10 +639,10 @@ void BuildAccelerationStructures(Validator& gpuav, const Location& loc, CommandB
                 break;
             }
             case kErrorSubCode_PreBuildAccelerationStructures_DestroyedASBuffer: {
-                skip |= gpuav.LogError(
-                    "VUID-vkCmdBuildAccelerationStructuresKHR-pInfos-12281", objlist, loc_with_debug_region,
-                    "%s is an invalid acceleration structure reference - underlying buffer %shas been destroyed. %s.",
-                    invalid_blas_loc_str.c_str(), ss_buffer_str.c_str(), ss_as_str.c_str());
+                skip |= gpuav.LogError("VUID-vkCmdBuildAccelerationStructuresKHR-pInfos-12281", objlist, loc_with_debug_region,
+                                       "%s is an invalid acceleration structure reference - underlying buffer %swas already "
+                                       "destroyed when build command started execution. %s.",
+                                       invalid_blas_loc_str.c_str(), ss_buffer_str.c_str(), ss_as_str.c_str());
                 break;
             }
             case kErrorSubCode_PreBuildAccelerationStructures_InvalidASType: {
@@ -654,6 +657,13 @@ void BuildAccelerationStructures(Validator& gpuav, const Location& loc, CommandB
                                        ss_as_type_str.c_str(), ss_as_str.c_str());
                 break;
             }
+            case kErrorSubCode_PreBuildAccelerationStructures_DestroyedASMemory: {
+                skip |= gpuav.LogError("VUID-vkCmdBuildAccelerationStructuresKHR-pInfos-03709", objlist, loc_with_debug_region,
+                                       "%s is an invalid acceleration structure reference - underlying buffer %swas not bound to "
+                                       "memory anymore when build command started execution. Memory was probably destroyed. %s.",
+                                       invalid_blas_loc_str.c_str(), ss_buffer_str.c_str(), ss_as_str.c_str());
+                break;
+            }
             case kErrorSubCode_PreBuildAccelerationStructures_BlasMemoryOverlap: {
                 const uint32_t blas_built_in_cmd_i = error_record[kValCmdErrorPayloadDword_4];
                 const BlasBuiltInCmd& blas_built_in_cmd = blas_built_in_cmd_array[blas_built_in_cmd_i];