Merge 05475de925 into a46aacf2e2

Merge branch 'Ryubing:master' into master
gpu: Switch the 500ms timeout back to 1s
2025-02-02 03:23:45 +00:00 · 2025-02-02 10:23:42 +07:00 · 2025-02-01 19:21:19 -06:00 · 2025-02-01 17:41:18 +01:00 · 2025-02-01 23:38:48 +07:00 · 2025-02-01 23:32:26 +07:00
2 changed files with 292 additions and 292 deletions
@@ -83,7 +83,7 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
            // TODO: Remove this when GPU channel scheduling will be implemented.
            if (timeout == Timeout.InfiniteTimeSpan)
            {
-                timeout = TimeSpan.FromMilliseconds(500);
+                timeout = TimeSpan.FromSeconds(1);
            }

            using ManualResetEvent waitEvent = new(false);
Author	SHA1	Message	Date
在中国的泰国青年_	b92cc18926	Merge `05475de925` into `a46aacf2e2`	2025-02-02 03:23:45 +00:00
在中国的泰国青年_	05475de925	Merge branch 'Ryubing:master' into master	2025-02-02 10:23:42 +07:00
Evan Husted	a46aacf2e2	gpu: Switch the 500ms timeout back to 1s It seemed like it was waiting for 1 second no matter what; might as well have the log & syncpoint map match reality.	2025-02-01 19:21:19 -06:00
LotP1	6aa2b9f02c	remove duplicate entries you should not add entries to your language if they match the english entry	2025-02-01 17:41:18 +01:00
在中国的泰国青年_	d691da72b6	Update locales.json	2025-02-01 23:38:48 +07:00
在中国的泰国青年_	17e6815416	Update locales.json	2025-02-01 23:32:26 +07:00
在中国的泰国青年_	4e87e2708b	Update locales.json	2025-02-01 20:11:48 +07:00
在中国的泰国青年_	911a63fc7b	Update locales.json	2025-02-01 19:41:36 +07:00