Skip to content
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

SDLGPU: Remove manual fence synchronization #227

Merged
merged 1 commit into from
Jan 8, 2025
Merged

SDLGPU: Remove manual fence synchronization #227

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
79 changes: 7 additions & 72 deletions src/FNA3D_Driver_SDL.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,11 +591,6 @@ typedef struct SDLGPU_Renderer
uint32_t bufferUploadBufferOffset;
uint32_t bufferUploadCycleCount;

/* Synchronization */

SDL_GPUFence **fenceGroups[MAX_FRAMES_IN_FLIGHT];
uint8_t frameCounter;

/* RT tracking to reduce unnecessary cycling */

SDLGPU_TextureHandle **boundRenderTargets;
Expand Down Expand Up @@ -985,7 +980,7 @@ static void SDLGPU_INTERNAL_FlushUploadCommands(
SDLGPU_Renderer *renderer
) {
SDL_LockMutex(renderer->copyPassMutex);

SDLGPU_INTERNAL_EndCopyPass(renderer);
SDL_SubmitGPUCommandBuffer(renderer->uploadCommandBuffer);
SDLGPU_INTERNAL_ResetUploadCommandBufferState(renderer);
Expand Down Expand Up @@ -1039,14 +1034,14 @@ static void SDLGPU_INTERNAL_FlushUploadCommandsAndStall(
SDL_GPUFence* fences[1];

SDLGPU_INTERNAL_FlushUploadCommandsAndAcquireFence(
renderer,
renderer,
&fences[0]
);

SDL_WaitForGPUFences(
renderer->device,
1,
fences,
renderer->device,
1,
fences,
1
);

Expand All @@ -1056,7 +1051,6 @@ static void SDLGPU_INTERNAL_FlushUploadCommandsAndStall(
);
}

/* FIXME: this will break with multi-window, need a claim/unclaim structure */
static void SDLGPU_SwapBuffers(
FNA3D_Renderer *driverData,
FNA3D_Rect *sourceRectangle,
Expand All @@ -1073,31 +1067,7 @@ static void SDLGPU_SwapBuffers(
SDLGPU_INTERNAL_EndCopyPass(renderer);
SDLGPU_INTERNAL_EndRenderPass(renderer);

if (renderer->fenceGroups[renderer->frameCounter][0] != NULL)
{
/* Wait for the least-recent fence */
SDL_WaitForGPUFences(
renderer->device,
1,
renderer->fenceGroups[renderer->frameCounter],
2
);

SDL_ReleaseGPUFence(
renderer->device,
renderer->fenceGroups[renderer->frameCounter][0]
);

SDL_ReleaseGPUFence(
renderer->device,
renderer->fenceGroups[renderer->frameCounter][1]
);

renderer->fenceGroups[renderer->frameCounter][0] = NULL;
renderer->fenceGroups[renderer->frameCounter][1] = NULL;
}

if (SDL_AcquireGPUSwapchainTexture(
if (SDL_WaitAndAcquireGPUSwapchainTexture(
renderer->renderCommandBuffer,
overrideWindowHandle,
&swapchainTexture,
Expand Down Expand Up @@ -1135,14 +1105,7 @@ static void SDLGPU_SwapBuffers(
);
}

SDLGPU_INTERNAL_FlushCommandsAndAcquireFence(
renderer,
&renderer->fenceGroups[renderer->frameCounter][0],
&renderer->fenceGroups[renderer->frameCounter][1]
);

renderer->frameCounter =
(renderer->frameCounter + 1) % MAX_FRAMES_IN_FLIGHT;
SDLGPU_INTERNAL_FlushCommands(renderer);

/* Reset bound RT state */
for (i = 0; i < renderer->boundRenderTargetCount; i += 1)
Expand Down Expand Up @@ -4084,27 +4047,6 @@ static void SDLGPU_DestroyDevice(FNA3D_Device *device)

SDLGPU_INTERNAL_DestroyFauxBackbuffer(renderer);

for (i = 0; i < MAX_FRAMES_IN_FLIGHT; i += 1)
{
if (renderer->fenceGroups[i][0] != NULL)
{
SDL_ReleaseGPUFence(
renderer->device,
renderer->fenceGroups[i][0]
);
}

if (renderer->fenceGroups[i][1] != NULL)
{
SDL_ReleaseGPUFence(
renderer->device,
renderer->fenceGroups[i][1]
);
}

SDL_free(renderer->fenceGroups[i]);
}

for (i = 0; i < NUM_PIPELINE_HASH_BUCKETS; i += 1)
{
for (j = 0; j < renderer->graphicsPipelineHashTable.buckets[i].count; j += 1)
Expand Down Expand Up @@ -4503,13 +4445,6 @@ static FNA3D_Device* SDLGPU_CreateDevice(
);
}

for (i = 0; i < MAX_FRAMES_IN_FLIGHT; i += 1)
{
renderer->fenceGroups[i] = SDL_malloc(2 * sizeof(SDL_GPUFence*));
renderer->fenceGroups[i][0] = NULL;
renderer->fenceGroups[i][1] = NULL;
}

#if SDL_PLATFORM_GDK
SDL_AddEventWatch(SDLGPU_INTERNAL_GDKEventFilter, renderer->device);
#endif
Expand Down
Loading