From 820733845c303f1f7c15b55191a84e2295a9c482 Mon Sep 17 00:00:00 2001
From: Tanner <tvandewalle@microsoft.com>
Date: Wed, 13 Mar 2024 23:01:10 -0700
Subject: [PATCH] Don't use the Default Heap optimzation for static buffers on
 UMA devices

Requires a change in d3d12translationlayer to add
ImmediateContext::m_architecture
---
 src/9on12Resource.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/9on12Resource.cpp b/src/9on12Resource.cpp
index 87f2c7e..7b1749d 100644
--- a/src/9on12Resource.cpp
+++ b/src/9on12Resource.cpp
@@ -1025,7 +1025,11 @@ namespace D3D9on12
 
             const D3D12TranslationLayer::RESOURCE_USAGE UsageFlag = GetResourceUsage(createArgs.Flags, m_CpuAccessFlags);
             D3D12_HEAP_TYPE HeapType = D3D12TranslationLayer::Resource::GetD3D12HeapType(UsageFlag, m_CpuAccessFlags);
-            if (HeapType == D3D12_HEAP_TYPE_UPLOAD && (createArgs.Flags.VertexBuffer || createArgs.Flags.IndexBuffer) &&
+            // We've seen some apps such as Unigine Valley experience corruption on systems with UMA when switching to HeapTypeDefault here, so skipping this optimization in that case for now
+            bool isUMA = m_pParentDevice->GetContext().m_architecture.isUMA;
+            if (!isUMA && 
+                HeapType == D3D12_HEAP_TYPE_UPLOAD &&
+                (createArgs.Flags.VertexBuffer || createArgs.Flags.IndexBuffer) &&
                 createArgs.Flags.HintStatic)
             {
                 HeapType = D3D12_HEAP_TYPE_DEFAULT;