Fix vulkan validation errors (#478)

* Ignore invalid validation error for acceleration structure null descriptors

* Bind 3D texture render targets as 2D arrays

Author: skallweitNV

src/vulkan/vk-command.cpp

@@ -603,12 +603,12 @@ void CommandRecorder::cmdBeginRenderPass(const commands::BeginRenderPass& cmd)
 
         // Create attachment info
         VkRenderingAttachmentInfoKHR attachmentInfo = {VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO_KHR};
-        attachmentInfo.imageView = checked_cast<TextureViewImpl*>(attachment.view)->getView().imageView;
+        attachmentInfo.imageView = checked_cast<TextureViewImpl*>(attachment.view)->getRenderTargetView().imageView;
         attachmentInfo.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
         if (attachment.resolveTarget)
         {
             attachmentInfo.resolveMode = VK_RESOLVE_MODE_AVERAGE_BIT;
-            attachmentInfo.resolveImageView = resolveView->getView().imageView;
+            attachmentInfo.resolveImageView = resolveView->getRenderTargetView().imageView;
             attachmentInfo.resolveImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
         }
         attachmentInfo.loadOp = translateLoadOp(attachment.loadOp);
@@ -648,7 +648,7 @@ void CommandRecorder::cmdBeginRenderPass(const commands::BeginRenderPass& cmd)
         {
             hasDepthAttachment = true;
             const auto& dsa = *desc.depthStencilAttachment;
-            depthAttachmentInfo.imageView = checked_cast<TextureViewImpl*>(dsa.view)->getView().imageView;
+            depthAttachmentInfo.imageView = checked_cast<TextureViewImpl*>(dsa.view)->getRenderTargetView().imageView;
             depthAttachmentInfo.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
             depthAttachmentInfo.loadOp = translateLoadOp(dsa.depthLoadOp);
             depthAttachmentInfo.storeOp = translateStoreOp(dsa.depthStoreOp);
@@ -658,7 +658,7 @@ void CommandRecorder::cmdBeginRenderPass(const commands::BeginRenderPass& cmd)
         {
             hasStencilAttachment = true;
             const auto& dsa = *desc.depthStencilAttachment;
-            stencilAttachmentInfo.imageView = checked_cast<TextureViewImpl*>(dsa.view)->getView().imageView;
+            stencilAttachmentInfo.imageView = checked_cast<TextureViewImpl*>(dsa.view)->getRenderTargetView().imageView;
             stencilAttachmentInfo.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
             stencilAttachmentInfo.loadOp = translateLoadOp(dsa.stencilLoadOp);
             stencilAttachmentInfo.storeOp = translateStoreOp(dsa.stencilStoreOp);

src/vulkan/vk-device.cpp

@@ -93,14 +93,23 @@ VkBool32 DeviceImpl::handleDebugMessage(
     {
         return VK_FALSE;
     }
-    // Ignore:  VUID-StandaloneSpirv-None-10684
+    // Ignore: VUID-StandaloneSpirv-None-10684
     // https://vulkan.lunarg.com/doc/view/1.4.313.1/windows/antora/spec/latest/appendices/spirvenv.html#VUID-StandaloneSpirv-None-10684
     // Not quite clear why this is happening, but for now we will ignore it.
     if (pCallbackData->messageIdNumber == -1307510846)
     {
         return VK_FALSE;
     }
 
+    // Ignore: VUID-VkWriteDescriptorSetAccelerationStructureKHR-pAccelerationStructures-03580
+    // https://vulkan.lunarg.com/doc/view/1.4.321.1/windows/antora/spec/latest/chapters/descriptorsets.html#VUID-VkWriteDescriptorSetAccelerationStructureKHR-pAccelerationStructures-03580
+    // Vulkan spec requires the nullDescriptor feature in VK_EXT_robustness2 to allow null-descriptors for acceleration
+    // structures but currently complains even when nullDescriptor is available and enabled.
+    if (pCallbackData->messageIdNumber == -1248876731)
+    {
+        return VK_FALSE;
+    }
+
     DebugMessageType msgType = DebugMessageType::Info;
 
     const char* severity = "message";

src/vulkan/vk-texture.cpp

@@ -114,11 +114,16 @@ TextureViewImpl::TextureViewImpl(Device* device, const TextureViewDesc& desc)
 {
 }
 
-TextureSubresourceView TextureImpl::getView(Format format, TextureAspect aspect, const SubresourceRange& range)
+TextureSubresourceView TextureImpl::getView(
+    Format format,
+    TextureAspect aspect,
+    const SubresourceRange& range,
+    bool isRenderTarget
+)
 {
     DeviceImpl* device = getDevice<DeviceImpl>();
 
-    ViewKey key = {format, aspect, range};
+    ViewKey key = {format, aspect, range, isRenderTarget};
 
     std::lock_guard<std::mutex> lock(m_mutex);
 
@@ -154,7 +159,8 @@ TextureSubresourceView TextureImpl::getView(Format format, TextureAspect aspect,
         createInfo.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY;
         break;
     case TextureType::Texture3D:
-        createInfo.viewType = VK_IMAGE_VIEW_TYPE_3D;
+        // 3D textures are bound as 2D arrays when used as render targets.
+        createInfo.viewType = isRenderTarget ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_3D;
         break;
     case TextureType::TextureCube:
         createInfo.viewType = VK_IMAGE_VIEW_TYPE_CUBE;
@@ -171,6 +177,12 @@ TextureSubresourceView TextureImpl::getView(Format format, TextureAspect aspect,
     createInfo.subresourceRange.layerCount = range.layerCount;
     createInfo.subresourceRange.levelCount = range.mipCount;
 
+    if (isRenderTarget && m_desc.type == TextureType::Texture3D)
+    {
+        createInfo.subresourceRange.baseArrayLayer = 0;
+        createInfo.subresourceRange.layerCount = m_desc.size.depth;
+    }
+
     VkResult result = device->m_api.vkCreateImageView(device->m_api.m_device, &createInfo, nullptr, &view.imageView);
     SLANG_RHI_ASSERT(result == VK_SUCCESS);
     return view;
@@ -200,7 +212,12 @@ Result TextureViewImpl::getDescriptorHandle(DescriptorHandleAccess access, Descr
 
 TextureSubresourceView TextureViewImpl::getView()
 {
-    return m_texture->getView(m_desc.format, m_desc.aspect, m_desc.subresourceRange);
+    return m_texture->getView(m_desc.format, m_desc.aspect, m_desc.subresourceRange, false);
+}
+
+TextureSubresourceView TextureViewImpl::getRenderTargetView()
+{
+    return m_texture->getView(m_desc.format, m_desc.aspect, m_desc.subresourceRange, true);
 }
 
 Result DeviceImpl::createTexture(const TextureDesc& desc_, const SubresourceData* initData, ITexture** outTexture)
@@ -241,6 +258,11 @@ Result DeviceImpl::createTexture(const TextureDesc& desc_, const SubresourceData
     {
         imageInfo.imageType = VK_IMAGE_TYPE_3D;
         imageInfo.extent = VkExtent3D{desc.size.width, desc.size.height, desc.size.depth};
+        // When using 3D textures as render targets, we need to be able to create 2d array views.
+        if (is_set(desc.usage, TextureUsage::RenderTarget))
+        {
+            imageInfo.flags = VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT;
+        }
         break;
     }
     case TextureType::TextureCube:

src/vulkan/vk-texture.h

@@ -31,9 +31,11 @@ class TextureImpl : public Texture
         Format format;
         TextureAspect aspect;
         SubresourceRange range;
+        bool isRenderTarget;
         bool operator==(const ViewKey& other) const
         {
-            return format == other.format && aspect == other.aspect && range == other.range;
+            return format == other.format && aspect == other.aspect && range == other.range &&
+                   isRenderTarget == other.isRenderTarget;
         }
     };
 
@@ -56,7 +58,12 @@ class TextureImpl : public Texture
     std::mutex m_mutex;
     std::unordered_map<ViewKey, TextureSubresourceView, ViewKeyHasher> m_views;
 
-    TextureSubresourceView getView(Format format, TextureAspect aspect, const SubresourceRange& range);
+    TextureSubresourceView getView(
+        Format format,
+        TextureAspect aspect,
+        const SubresourceRange& range,
+        bool isRenderTarget
+    );
 };
 
 class TextureViewImpl : public TextureView
@@ -79,6 +86,7 @@ class TextureViewImpl : public TextureView
     ) override;
 
     TextureSubresourceView getView();
+    TextureSubresourceView getRenderTargetView();
 };
 
 } // namespace rhi::vk