lee/OptiScaler
1
0
Fork 0
mirror of https://github.com/optiscaler/OptiScaler.git synced 2026-08-25 07:36:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for hkD3D11On12CreateDevice with more than one Queue

Browse Source
This commit is contained in:
cdozdil
2026-07-31 21:46:11 +03:00
parent d8dab18a64
commit 0d67ec4feb
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/hooks/D3D11_Hooks.cpp
+10 -5
View File
@@ -135,18 +135,22 @@ static HRESULT hkD3D11On12CreateDevice(IUnknown* pDevice, UINT Flags, const D3D_
bool rtss = false;
IUnknown* copyCommandQueues = *ppCommandQueues;
std::vector<IUnknown*> copyCommandQueues;
if (ppCommandQueues && NumQueues > 0)
copyCommandQueues.assign(ppCommandQueues, ppCommandQueues + NumQueues);
// Assuming RTSS is creating a D3D11on12 device, not sure why but sometimes RTSS tries to create
// it's D3D11on12 device with old CommandQueue which results crash
// I am changing it's CommandQueue with current swapchain's command queue
if (State::Instance().currentCommandQueue != nullptr && *ppCommandQueues != State::Instance().currentCommandQueue &&
if (State::Instance().currentCommandQueue != nullptr &&
copyCommandQueues[0] != State::Instance().currentCommandQueue &&
GetModuleHandle(L"RTSSHooks64.dll") != nullptr && pDevice == State::Instance().currentD3D12Device)
{
LOG_INFO("Replaced RTSS CommandQueue with correct one {0:X} -> {1:X}", (UINT64) *ppCommandQueues,
(UINT64) State::Instance().currentCommandQueue);
copyCommandQueues = State::Instance().currentCommandQueue;
copyCommandQueues[0] = State::Instance().currentCommandQueue;
rtss = true;
}
@@ -154,8 +158,9 @@ static HRESULT hkD3D11On12CreateDevice(IUnknown* pDevice, UINT Flags, const D3D_
HRESULT result = E_FAIL;
{
ScopedCreatingD3DDevice skipCreatingD3DDevice {};
result = o_D3D11On12CreateDevice(pDevice, Flags, pFeatureLevels, FeatureLevels, &copyCommandQueues, NumQueues,
NodeMask, ppDevice, ppImmediateContext, pChosenFeatureLevel);
result = o_D3D11On12CreateDevice(pDevice, Flags, pFeatureLevels, FeatureLevels, copyCommandQueues.data(),
static_cast<UINT>(copyCommandQueues.size()), NodeMask, ppDevice,
ppImmediateContext, pChosenFeatureLevel);
}
if (result == S_OK && *ppDevice != nullptr && !rtss && State::Instance().currentD3D12Device == nullptr)