mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-09-03 20:30:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3d12: Read the fence in SubmitAndAcquireFence while submitLock is held

Browse Source 
Once the lock is released, another thread can clean up the completed
command buffer, return it to the pool and resubmit it with a different
fence before we read d3d12CommandBuffer->inFlightFence, handing the
caller a fence it doesn't own (or NULL).

(cherry picked from commit f443c429c6)
This commit is contained in:
William Horvath
2026-08-29 17:06:19 +09:00
committed by Sam Lantinga
parent 51ef86a11f
commit 9a29f763e1
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gpu/d3d12/SDL_gpu_d3d12.c
View File

@@ -7957,8 +7957,9 @@ static bool D3D12_INTERNAL_CleanCommandBuffer(
return true;
}
static bool D3D12_Submit(
SDL_GPUCommandBuffer *commandBuffer)
static bool D3D12_INTERNAL_Submit(
SDL_GPUCommandBuffer *commandBuffer,
SDL_GPUFence **fence)
{
D3D12CommandBuffer *d3d12CommandBuffer = (D3D12CommandBuffer *)commandBuffer;
D3D12Renderer *renderer = d3d12CommandBuffer->renderer;
@@ -8036,6 +8037,12 @@ static bool D3D12_Submit(
return false;
}
// Return the fence while submitLock is held, another thread could
// recycle this command buffer as soon as the lock is released.
if (fence) {
*fence = (SDL_GPUFence *)d3d12CommandBuffer->inFlightFence;
}
// Mark that a fence should be signaled after command list execution
res = ID3D12CommandQueue_Signal(
renderer->commandQueue,
@@ -8134,15 +8141,22 @@ static bool D3D12_Submit(
return result;
}
static bool D3D12_Submit(
SDL_GPUCommandBuffer *commandBuffer)
{
return D3D12_INTERNAL_Submit(commandBuffer, NULL);
}
static SDL_GPUFence *D3D12_SubmitAndAcquireFence(
SDL_GPUCommandBuffer *commandBuffer)
{
D3D12CommandBuffer *d3d12CommandBuffer = (D3D12CommandBuffer *)commandBuffer;
SDL_GPUFence *fence = NULL;
d3d12CommandBuffer->autoReleaseFence = false;
if (!D3D12_Submit(commandBuffer)) {
if (!D3D12_INTERNAL_Submit(commandBuffer, &fence)) {
return NULL;
}
return (SDL_GPUFence *)d3d12CommandBuffer->inFlightFence;
return fence;
}
static bool D3D12_Cancel(