Add c_initialRead/UAVTargetState to help with PC vs. Xbox warnings (m…

…icrosoft#217)
sysfce2 · Mar 12, 2024 · c94ad84 · c94ad84
1 parent ca971ac
commit c94ad84
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -307,6 +307,9 @@
     { "name": "arm64-Debug"  , "configurePreset": "arm64-Debug" },
     { "name": "arm64-Release", "configurePreset": "arm64-Release" },
 
+    { "name": "x64-Debug-VCPKG"    , "configurePreset": "x64-Debug-VCPKG" },
+    { "name": "x64-Release-VCPKG"  , "configurePreset": "x64-Release-VCPKG" },
+
     { "name": "x64-Debug-Clang"    , "configurePreset": "x64-Debug-Clang" },
     { "name": "x64-Release-Clang"  , "configurePreset": "x64-Release-Clang" },
     { "name": "x86-Debug-Clang"    , "configurePreset": "x86-Debug-Clang" },

diff --git a/Inc/DirectXHelpers.h b/Inc/DirectXHelpers.h
@@ -117,8 +117,12 @@ namespace DirectX
 {
 #if (defined(_XBOX_ONE) && defined(_TITLE)) || defined(_GAMING_XBOX)
     constexpr D3D12_RESOURCE_STATES c_initialCopyTargetState = D3D12_RESOURCE_STATE_COPY_DEST;
+    constexpr D3D12_RESOURCE_STATES c_initialReadTargetState = D3D12_RESOURCE_STATE_GENERIC_READ;
+    constexpr D3D12_RESOURCE_STATES c_initialUAVTargetState = D3D12_RESOURCE_STATE_UNORDERED_ACCESS;
 #else
     constexpr D3D12_RESOURCE_STATES c_initialCopyTargetState = D3D12_RESOURCE_STATE_COMMON;
+    constexpr D3D12_RESOURCE_STATES c_initialReadTargetState = D3D12_RESOURCE_STATE_COMMON;
+    constexpr D3D12_RESOURCE_STATES c_initialUAVTargetState = D3D12_RESOURCE_STATE_COMMON;
 #endif
 
     constexpr D3D12_CPU_DESCRIPTOR_HANDLE D3D12_CPU_DESCRIPTOR_HANDLE_ZERO = {};