From cd2a432cb61425bf5956b311b5af99334786c457 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 9 Oct 2024 17:06:06 +0100
Subject: [PATCH] Identify new-barrier ASB flag as equivalent to old-barrier
 ASB state

---
 renderdoc/driver/d3d12/d3d12_device_rescreate_wrap.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/renderdoc/driver/d3d12/d3d12_device_rescreate_wrap.cpp b/renderdoc/driver/d3d12/d3d12_device_rescreate_wrap.cpp
index c3be71aa9..d20da8515 100644
--- a/renderdoc/driver/d3d12/d3d12_device_rescreate_wrap.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device_rescreate_wrap.cpp
@@ -274,7 +274,8 @@ bool WrappedID3D12Device::Serialise_CreateResource(
   if(desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
   {
     type = ResourceType::Buffer;
-    if(InitialLayout.ToStates() == D3D12_RESOURCE_STATE_RAYTRACING_ACCELERATION_STRUCTURE)
+    if((desc.Flags & D3D12_RESOURCE_FLAG_RAYTRACING_ACCELERATION_STRUCTURE) ||
+       InitialLayout.ToStates() == D3D12_RESOURCE_STATE_RAYTRACING_ACCELERATION_STRUCTURE)
     {
       prefix = "AS Buffer";
       ((WrappedID3D12Resource *)ret)->MarkAsAccelerationStructureResource();
@@ -541,7 +542,8 @@ HRESULT WrappedID3D12Device::CreateResource(
     wrapped->SetResourceRecord(record);
 
     if(desc0.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER &&
-       InitialLayout.ToStates() == D3D12_RESOURCE_STATE_RAYTRACING_ACCELERATION_STRUCTURE)
+       ((desc.Flags & D3D12_RESOURCE_FLAG_RAYTRACING_ACCELERATION_STRUCTURE) ||
+        InitialLayout.ToStates() == D3D12_RESOURCE_STATE_RAYTRACING_ACCELERATION_STRUCTURE))
     {
       wrapped->MarkAsAccelerationStructureResource();
       m_UsedRT = true;