Skip to content

Core: validate DX11 display-composition back buffer #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JohsonChou wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Core: validate DX11 display-composition back buffer #211

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 33 additions & 10 deletions Source/Core/core.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5726,18 +5726,39 @@ namespace
{
IDXGISwapChain* native_swapchain = (IDXGISwapChain*)(swapchain->get_native());

UINT back_buffer_index = 0;
com_ptr<IDXGISwapChain3> native_swapchain3;
// The cast pointer is actually the same, we are just making sure the type is right (it should always be).
// This would always be 1 in DX11, even if two buffers were requested.
if (SUCCEEDED(native_swapchain->QueryInterface(&native_swapchain3)))
// The DX11 ReShade backend exposes a single logical back buffer. Avoid
// indexing Luma's logical state with a native flip-model buffer index.
const UINT back_buffer_index = swapchain->get_current_back_buffer_index();
com_ptr<ID3D11Texture2D> back_buffer;
const HRESULT get_buffer_hr = native_swapchain != nullptr
? native_swapchain->GetBuffer(back_buffer_index, IID_PPV_ARGS(&back_buffer))
: E_FAIL;

bool tracked_back_buffer = false;
size_t tracked_back_buffer_count = 0;
size_t display_composition_rtv_count = 0;
if (SUCCEEDED(get_buffer_hr) && back_buffer != nullptr)
{
back_buffer_index = native_swapchain3->GetCurrentBackBufferIndex();
const std::shared_lock lock_swapchain(swapchain_data.mutex);
tracked_back_buffer_count = swapchain_data.back_buffers.size();
display_composition_rtv_count = swapchain_data.display_composition_rtvs.size();
tracked_back_buffer = swapchain_data.back_buffers.contains(reinterpret_cast<uint64_t>(back_buffer.get()));
}

if (FAILED(get_buffer_hr) || back_buffer == nullptr || !tracked_back_buffer || back_buffer_index >= display_composition_rtv_count)
{
// Do not interrupt the end-of-frame work below: it resets per-frame
// game state and releases resources queued for destruction.
static std::atomic<bool> warning_sent;
if (!warning_sent.exchange(true, std::memory_order_relaxed))
{
OverlayLog::AddWarning(
"Display composition skipped: GetBuffer({}) returned 0x{:08X}; tracked buffers={}, RTVs={}, tracked={}.",
back_buffer_index, static_cast<uint32_t>(get_buffer_hr), tracked_back_buffer_count,
display_composition_rtv_count, tracked_back_buffer);
}
goto AfterDisplayComposition;
}
com_ptr<ID3D11Texture2D> back_buffer;
native_swapchain->GetBuffer(back_buffer_index, IID_PPV_ARGS(&back_buffer));
assert(back_buffer != nullptr && swapchain_data.back_buffers.size() >= back_buffer_index + 1);
assert(swapchain_data.display_composition_rtvs.size() >= back_buffer_index + 1);

D3D11_TEXTURE2D_DESC target_desc;
back_buffer->GetDesc(&target_desc);
Expand Down Expand Up @@ -6124,6 +6145,8 @@ namespace
}
}

AfterDisplayComposition:

#if DEVELOPMENT
// Clear at the end of every frame and re-capture it in the next frame if its still available
if (debug_draw_auto_clear_texture)
Expand Down