Merge pull request #111957 from clayjohn/RD-timeout

Repiteo · Repiteo · commit beac359f87b0 · 2025-10-23T15:34:00.000-05:00
Sync final frame after finalizing RD to ensure that nothing is in use on the GPU when we free the RD
diff --git a/servers/rendering/rendering_device.cpp b/servers/rendering/rendering_device.cpp
@@ -6591,6 +6591,8 @@ void RenderingDevice::_flush_and_stall_for_all_frames(bool p_begin_frame) {
 
 	if (p_begin_frame) {
 		_begin_frame();
+	} else {
+		_stall_for_frame(frame);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -6591,6 +6591,8 @@ void RenderingDevice::_flush_and_stall_for_all_frames(bool p_begin_frame) {`
`6591`	`6591`
`6592`	`6592`	`if (p_begin_frame) {`
`6593`	`6593`	`_begin_frame();`
	`6594`	`+ } else {`
	`6595`	`+ _stall_for_frame(frame);`
`6594`	`6596`	`}`
`6595`	`6597`	`}`
`6596`	`6598`