rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-04-05 16:40:17 +02:00
Code Issues Projects Releases Wiki Activity

[d3d11] Synchronize queue submissions for 11on12 devices as necessary

Browse Source 
When the app explicitly calls Flush, Signal or Wait, we need to wait
for the submission to actually take place so that subsequent D3D12
submissions execute in the correct order.
This commit is contained in:
Philip Rebohle 2023-03-16 13:15:35 +01:00
parent 6432787ac3
commit 3f9d2269f6
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/d3d11/d3d11_context_imm.cpp
View File

@ -49,7 +49,7 @@ namespace dxvk {
if (this_thread::isInModuleDetachment()) if (this_thread::isInModuleDetachment())
return; return;
ExecuteFlush(GpuFlushType::ExplicitFlush, nullptr); ExecuteFlush(GpuFlushType::ExplicitFlush, nullptr, true);
SynchronizeCsThread(DxvkCsThread::SynchronizeAll); SynchronizeCsThread(DxvkCsThread::SynchronizeAll);
SynchronizeDevice(); SynchronizeDevice();
} }
@ -150,7 +150,7 @@ namespace dxvk {
query->NotifyEnd(); query->NotifyEnd();
if (query->IsStalling()) if (query->IsStalling())
ExecuteFlush(GpuFlushType::ImplicitSynchronization, nullptr); ExecuteFlush(GpuFlushType::ImplicitSynchronization, nullptr, false);
else if (query->IsEvent()) else if (query->IsEvent())
ConsiderFlush(GpuFlushType::ImplicitStrongHint); ConsiderFlush(GpuFlushType::ImplicitStrongHint);
} }
@ -160,7 +160,7 @@ namespace dxvk {
void STDMETHODCALLTYPE D3D11ImmediateContext::Flush() { void STDMETHODCALLTYPE D3D11ImmediateContext::Flush() {
D3D10DeviceLock lock = LockContext(); D3D10DeviceLock lock = LockContext();
ExecuteFlush(GpuFlushType::ExplicitFlush, nullptr); ExecuteFlush(GpuFlushType::ExplicitFlush, nullptr, true);
} }
@ -169,7 +169,7 @@ namespace dxvk {
HANDLE hEvent) { HANDLE hEvent) {
D3D10DeviceLock lock = LockContext(); D3D10DeviceLock lock = LockContext();
ExecuteFlush(GpuFlushType::ExplicitFlush, hEvent); ExecuteFlush(GpuFlushType::ExplicitFlush, hEvent, true);
} }
@ -189,7 +189,7 @@ namespace dxvk {
ctx->signalFence(cFence, cValue); ctx->signalFence(cFence, cValue);
}); });
ExecuteFlush(GpuFlushType::ExplicitFlush, nullptr); ExecuteFlush(GpuFlushType::ExplicitFlush, nullptr, true);
return S_OK; return S_OK;
} }
@ -203,7 +203,7 @@ namespace dxvk {
if (!fence) if (!fence)
return E_INVALIDARG; return E_INVALIDARG;
ExecuteFlush(GpuFlushType::ExplicitFlush, nullptr); ExecuteFlush(GpuFlushType::ExplicitFlush, nullptr, true);
EmitCs([ EmitCs([
cFence = fence->GetFence(), cFence = fence->GetFence(),
@ -811,7 +811,7 @@ namespace dxvk {
if (isInUse) { if (isInUse) {
// Make sure pending commands using the resource get // Make sure pending commands using the resource get
// executed on the the GPU if we have to wait for it // executed on the the GPU if we have to wait for it
ExecuteFlush(GpuFlushType::ImplicitSynchronization, nullptr); ExecuteFlush(GpuFlushType::ImplicitSynchronization, nullptr, false);
SynchronizeCsThread(SequenceNumber); SynchronizeCsThread(SequenceNumber);
m_device->waitForResource(Resource, access); m_device->waitForResource(Resource, access);
@ -865,13 +865,19 @@ namespace dxvk {
uint64_t submissionId = m_submissionFence->value(); uint64_t submissionId = m_submissionFence->value();
if (m_flushTracker.considerFlush(FlushType, chunkId, submissionId)) if (m_flushTracker.considerFlush(FlushType, chunkId, submissionId))
ExecuteFlush(FlushType, nullptr); ExecuteFlush(FlushType, nullptr, false);
} }
void D3D11ImmediateContext::ExecuteFlush( void D3D11ImmediateContext::ExecuteFlush(
GpuFlushType FlushType, GpuFlushType FlushType,
HANDLE hEvent) { HANDLE hEvent,
BOOL Synchronize) {
bool synchronizeSubmission = Synchronize && m_parent->Is11on12Device();
if (synchronizeSubmission)
m_submitStatus.result = VK_NOT_READY;
// Flush init context so that new resources are fully initialized // Flush init context so that new resources are fully initialized
// before the app can access them in any way. This has to happen // before the app can access them in any way. This has to happen
// unconditionally since we may otherwise deadlock on Map. // unconditionally since we may otherwise deadlock on Map.
@ -892,10 +898,11 @@ namespace dxvk {
EmitCs<false>([ EmitCs<false>([
cSubmissionFence = m_submissionFence, cSubmissionFence = m_submissionFence,
cSubmissionId = submissionId cSubmissionId = submissionId,
cSubmissionStatus = synchronizeSubmission ? &m_submitStatus : nullptr
] (DxvkContext* ctx) { ] (DxvkContext* ctx) {
ctx->signal(cSubmissionFence, cSubmissionId); ctx->signal(cSubmissionFence, cSubmissionId);
ctx->flushCommandList(nullptr); ctx->flushCommandList(cSubmissionStatus);
}); });
FlushCsChunk(); FlushCsChunk();
@ -903,6 +910,11 @@ namespace dxvk {
// Notify flush tracker about the flush // Notify flush tracker about the flush
m_flushSeqNum = m_csSeqNum; m_flushSeqNum = m_csSeqNum;
m_flushTracker.notifyFlush(m_flushSeqNum, submissionId); m_flushTracker.notifyFlush(m_flushSeqNum, submissionId);
// If necessary, block calling thread until the
// Vulkan queue submission is performed.
if (synchronizeSubmission)
m_device->waitForSubmission(&m_submitStatus);
} }
} }

4
src/d3d11/d3d11_context_imm.h
View File

@ -95,6 +95,7 @@ namespace dxvk {
Rc<sync::CallbackFence> m_submissionFence; Rc<sync::CallbackFence> m_submissionFence;
uint64_t m_submissionId = 0ull; uint64_t m_submissionId = 0ull;
DxvkSubmitStatus m_submitStatus;
uint64_t m_flushSeqNum = 0ull; uint64_t m_flushSeqNum = 0ull;
GpuFlushTracker m_flushTracker; GpuFlushTracker m_flushTracker;
@ -165,7 +166,8 @@ namespace dxvk {
void ExecuteFlush( void ExecuteFlush(
GpuFlushType FlushType, GpuFlushType FlushType,
HANDLE hEvent); HANDLE hEvent,
BOOL Synchronize);
}; };