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

metal: 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 metalCommandBuffer->fence, handing the caller a
fence it doesn't own.

(cherry picked from commit 10309e3240)
This commit is contained in:
William Horvath
2026-08-29 16:13:37 +09:00
committed by Sam Lantinga
parent 295ca921c4
commit 39664f3b77
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gpu/metal/SDL_gpu_metal.m
View File

@@ -4063,8 +4063,9 @@ static bool METAL_SetAllowedFramesInFlight(
// Submission
static bool METAL_Submit(
SDL_GPUCommandBuffer *commandBuffer)
static bool METAL_INTERNAL_Submit(
SDL_GPUCommandBuffer *commandBuffer,
SDL_GPUFence **fence)
{
@autoreleasepool {
MetalCommandBuffer *metalCommandBuffer = (MetalCommandBuffer *)commandBuffer;
@@ -4077,6 +4078,12 @@ static bool METAL_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 *)metalCommandBuffer->fence;
}
// Enqueue present requests, if applicable
for (Uint32 i = 0; i < metalCommandBuffer->windowDataCount; i += 1) {
MetalWindowData *windowData = metalCommandBuffer->windowDatas[i];
@@ -4123,15 +4130,22 @@ static bool METAL_Submit(
}
}
static bool METAL_Submit(
SDL_GPUCommandBuffer *commandBuffer)
{
return METAL_INTERNAL_Submit(commandBuffer, NULL);
}
static SDL_GPUFence *METAL_SubmitAndAcquireFence(
SDL_GPUCommandBuffer *commandBuffer)
{
MetalCommandBuffer *metalCommandBuffer = (MetalCommandBuffer *)commandBuffer;
SDL_GPUFence *fence = NULL;
metalCommandBuffer->autoReleaseFence = false;
if (!METAL_Submit(commandBuffer)) {
if (!METAL_INTERNAL_Submit(commandBuffer, &fence)) {
return NULL;
}
return (SDL_GPUFence *)metalCommandBuffer->fence;
return fence;
}
static bool METAL_Cancel(