D3D12: Use buffer count described in swapchain desc

praydog · Mar 7, 2025 · 7e3df90 · 7e3df90
1 parent 63f3b85
commit 7e3df90
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/REFramework.cpp b/src/REFramework.cpp
@@ -2241,7 +2241,20 @@ bool REFramework::init_d3d12() {
         // Create back buffer rtvs.
         auto swapchain = m_d3d12_hook->get_swap_chain();
 
-        for (auto i = 0; i <= (int)D3D12::RTV::BACKBUFFER_6; ++i) {
+        DXGI_SWAP_CHAIN_DESC swapchain_desc{};
+
+        if (FAILED(swapchain->GetDesc(&swapchain_desc))) {
+            spdlog::error("[D3D12] Failed to get swap chain description.");
+            return false;
+        }
+
+        spdlog::info("[D3D12] Swapchain buffer count: {}", swapchain_desc.BufferCount);
+
+        if (swapchain_desc.BufferCount > (int)D3D12::RTV::BACKBUFFER_LAST + 1) {
+            spdlog::warn("[D3D12] Too many back buffers ({} vs {}).", swapchain_desc.BufferCount, (int)D3D12::RTV::BACKBUFFER_LAST + 1);
+        }
+
+        for (auto i = 0; i < (int)swapchain_desc.BufferCount; ++i) {
             if (SUCCEEDED(swapchain->GetBuffer(i, IID_PPV_ARGS(&m_d3d12.rts[i])))) {
                 device->CreateRenderTargetView(m_d3d12.rts[i].Get(), nullptr, m_d3d12.get_cpu_rtv(device, (D3D12::RTV)i));
             } else {

diff --git a/src/REFramework.hpp b/src/REFramework.hpp
@@ -307,6 +307,9 @@ class REFramework {
             BACKBUFFER_4,
             BACKBUFFER_5,
             BACKBUFFER_6,
+            BACKBUFFER_7,
+            BACKBUFFER_8,
+            BACKBUFFER_LAST = BACKBUFFER_8,
             IMGUI,
             BLANK,
             COUNT,