Don't acquire new command buffers on DestroyDevice

FNA-XNA · Oct 9, 2024 · d34eecf · d34eecf
1 parent 93cc347
commit d34eecf
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/FNA3D_Driver_SDL.c b/src/FNA3D_Driver_SDL.c
@@ -1741,7 +1741,7 @@ static void SDLGPU_VerifyVertexSampler(
 			{
 				renderer->vertexTextureSamplerBindings[index].texture = renderer->dummyTextureCube;
 			}
-		} 
+		}
 		else
 		{
 			renderer->vertexTextureSamplerBindings[index].texture = renderer->dummyTexture2D;
@@ -1787,7 +1787,7 @@ static void SDLGPU_VerifySampler(
 	{
 		renderer->fragmentTextureSamplerBindings[index].sampler = renderer->dummySampler;
 
-		if (fragShader) 
+		if (fragShader)
 		{
 			samplerType = MOJOSHADER_sdlGetShaderParseData(fragShader)->samplers[index].type;
 			if (samplerType == MOJOSHADER_SAMPLER_2D)
@@ -3927,7 +3927,11 @@ static void SDLGPU_DestroyDevice(FNA3D_Device *device)
 	SDLGPU_Renderer *renderer = (SDLGPU_Renderer*) device->driverData;
 	int32_t i, j;
 
-	SDLGPU_INTERNAL_FlushCommandsAndStall(renderer);
+	// Completely flush command buffers and stall
+	SDLGPU_INTERNAL_FlushCommands(renderer);
+	SDL_SubmitGPUCommandBuffer(renderer->uploadCommandBuffer);
+	SDL_SubmitGPUCommandBuffer(renderer->renderCommandBuffer);
+	SDL_WaitForGPUIdle(renderer->device);
 
 	if (renderer->textureDownloadBuffer != NULL)
 	{