Skip to content

Fix race conditions in MetalRedrawer #2672

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

Merged
ASalavei merged 1 commit into from
Jan 16, 2026
Merged

Fix race conditions in MetalRedrawer #2672

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
14 changes: 11 additions & 3 deletions compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/window/MetalRedrawer.ios.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,14 @@ internal class MetalRedrawer(
caDisplayLink?.invalidate()
caDisplayLink = null

// Wait until all scheduled rendering tasks are completed to eliminate race conditions
// when clearing the resources
if (useSeparateRenderThreadWhenPossible) {
trace("MetalRedrawer:dispose:waitForAsyncRenderingTasks") {
dispatch_sync(renderingDispatchQueue) {}
}
}

pictureRecorder.close()
context.close()
}
Expand Down Expand Up @@ -431,6 +439,9 @@ internal class MetalRedrawer(
picture.close()
surface.flushAndSubmit()

surface.close()
renderTarget.close()

if (useSeparateRenderThreadWhenPossible) {
dispatch_semaphore_signal(drawCanvasSemaphore)
}
Expand Down Expand Up @@ -470,9 +481,6 @@ internal class MetalRedrawer(
}
}

surface.close()
renderTarget.close()

// Track current inflight command buffers to synchronously wait for their schedule in case app goes background
inflightCommandBuffers.add(commandBuffer)

Expand Down