OpenXRUtilities: properly set swap chain image state

DiligentGraphics · Dec 8, 2024 · 7266a60 · 7266a60
1 parent 015bb82
commit 7266a60
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/Graphics/GraphicsTools/src/OpenXRUtilities.cpp b/Graphics/GraphicsTools/src/OpenXRUtilities.cpp
@@ -27,6 +27,7 @@
 #include "OpenXRUtilities.h"
 
 #include "DebugUtilities.hpp"
+#include "GraphicsAccessories.hpp"
 
 namespace Diligent
 {
@@ -241,6 +242,12 @@ void GetOpenXRSwapchainImage(IRenderDevice*                    pDevice,
         default:
             UNSUPPORTED("Unsupported device type");
     }
+
+    if (*ppImage)
+    {
+        const TextureFormatAttribs& FmtAttribs = GetTextureFormatAttribs((*ppImage)->GetDesc().Format);
+        (*ppImage)->SetState(FmtAttribs.IsDepthStencil() ? RESOURCE_STATE_DEPTH_WRITE : RESOURCE_STATE_RENDER_TARGET);
+    }
 }
 
 static XrBool32 OpenXRMessageCallbackFunction(XrDebugUtilsMessageSeverityFlagsEXT         xrMessageSeverity,

diff --git a/Graphics/GraphicsTools/src/OpenXRUtilitiesD3D11.cpp b/Graphics/GraphicsTools/src/OpenXRUtilitiesD3D11.cpp
@@ -96,7 +96,7 @@ void GetOpenXRSwapchainImageD3D11(IRenderDevice*                    pDevice,
     RefCntAutoPtr<IRenderDeviceD3D11> pDeviceD3D11{pDevice, IID_RenderDeviceD3D11};
     VERIFY_EXPR(pDeviceD3D11 != nullptr);
 
-    pDeviceD3D11->CreateTexture2DFromD3DResource(texture, RESOURCE_STATE_RENDER_TARGET, ppImage);
+    pDeviceD3D11->CreateTexture2DFromD3DResource(texture, RESOURCE_STATE_UNDEFINED, ppImage);
 }
 
 } // namespace Diligent
diff --git a/Graphics/GraphicsTools/src/OpenXRUtilitiesD3D12.cpp b/Graphics/GraphicsTools/src/OpenXRUtilitiesD3D12.cpp
@@ -115,7 +115,7 @@ void GetOpenXRSwapchainImageD3D12(IRenderDevice*                    pDevice,
     RefCntAutoPtr<IRenderDeviceD3D12> pDeviceD3D12{pDevice, IID_RenderDeviceD3D12};
     VERIFY_EXPR(pDeviceD3D12 != nullptr);
 
-    pDeviceD3D12->CreateTextureFromD3DResource(texture, RESOURCE_STATE_RENDER_TARGET, ppImage);
+    pDeviceD3D12->CreateTextureFromD3DResource(texture, RESOURCE_STATE_UNDEFINED, ppImage);
 }
 
 

diff --git a/Graphics/GraphicsTools/src/OpenXRUtilitiesVk.cpp b/Graphics/GraphicsTools/src/OpenXRUtilitiesVk.cpp
@@ -114,7 +114,7 @@ void GetOpenXRSwapchainImageVk(IRenderDevice*                    pDevice,
     RefCntAutoPtr<IRenderDeviceVk> pDeviceVk{pDevice, IID_RenderDeviceVk};
     VERIFY_EXPR(pDeviceVk != nullptr);
 
-    pDeviceVk->CreateTextureFromVulkanImage(image, TexDesc, RESOURCE_STATE_RENDER_TARGET, ppImage);
+    pDeviceVk->CreateTextureFromVulkanImage(image, TexDesc, RESOURCE_STATE_UNDEFINED, ppImage);
 }
 
 } // namespace Diligent