From 656e00202bd2a246e8702797dfb088ae104ca5f5 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 21 Oct 2022 02:40:32 +0200 Subject: [PATCH 1/2] Fix warning --- rpcs3/Emu/System.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index f4ae9109fd6e..dc97a85b8230 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -2288,7 +2288,7 @@ std::shared_ptr Emulator::Kill(bool allow_autoexit, bool savestat named_thread stop_watchdog("Stop Watchdog", [&]() { - for (uint i = 0; thread_ctrl::state() != thread_state::aborting;) + for (int i = 0; thread_ctrl::state() != thread_state::aborting;) { // We don't need accurate timekeeping, using clocks may interfere with debugging if (i >= (savestate ? 2000 : 1000)) From 25b1e899f64b02311d26757b91e507407f12f359 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 21 Oct 2022 02:39:13 +0200 Subject: [PATCH 2/2] Update dependencies zlib 1.2.12 -> 1.2.13 libpng 1.6.37 -> 1.6.38 glslang sdk-1.3.216.0 -> sdk-1.3.224.1 SPIRV-Headers sdk-1.3.211.0 -> sdk-1.3.224.1 SPIRV-Tools sdk-1.3.211.0 -> sdk-1.3.224.1 --- 3rdparty/SPIRV/SPIRV-Headers | 2 +- 3rdparty/SPIRV/SPIRV-Tools | 2 +- 3rdparty/glslang/glslang | 2 +- 3rdparty/libpng/libpng | 2 +- 3rdparty/zlib/zlib | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/3rdparty/SPIRV/SPIRV-Headers b/3rdparty/SPIRV/SPIRV-Headers index 4995a2f2723c..b2a156e1c043 160000 --- a/3rdparty/SPIRV/SPIRV-Headers +++ b/3rdparty/SPIRV/SPIRV-Headers @@ -1 +1 @@ -Subproject commit 4995a2f2723c401eb0ea3e10c81298906bf1422b +Subproject commit b2a156e1c0434bc8c99aaebba1c7be98be7ac580 diff --git a/3rdparty/SPIRV/SPIRV-Tools b/3rdparty/SPIRV/SPIRV-Tools index 7826e1941eab..5e61ea209822 160000 --- a/3rdparty/SPIRV/SPIRV-Tools +++ b/3rdparty/SPIRV/SPIRV-Tools @@ -1 +1 @@ -Subproject commit 7826e1941eab1aa66fbe84c48b95921bff402a96 +Subproject commit 5e61ea2098220059e89523f1f47b0bcd8c33b89a diff --git a/3rdparty/glslang/glslang b/3rdparty/glslang/glslang index adbf0d3106b2..10423ec659d3 160000 --- a/3rdparty/glslang/glslang +++ b/3rdparty/glslang/glslang @@ -1 +1 @@ -Subproject commit adbf0d3106b26daa237b10b9bf72b1af7c31092d +Subproject commit 10423ec659d301a0ff2daac8bbf38980abf27590 diff --git a/3rdparty/libpng/libpng b/3rdparty/libpng/libpng index a40189cf881e..0a158f350650 160000 --- a/3rdparty/libpng/libpng +++ b/3rdparty/libpng/libpng @@ -1 +1 @@ -Subproject commit a40189cf881e9f0db80511c382292a5604c3c3d1 +Subproject commit 0a158f3506502dfa23edfc42790dfaed82efba17 diff --git a/3rdparty/zlib/zlib b/3rdparty/zlib/zlib index 21767c654d31..04f42ceca40f 160000 --- a/3rdparty/zlib/zlib +++ b/3rdparty/zlib/zlib @@ -1 +1 @@ -Subproject commit 21767c654d31d2dccdde4330529775c6c5fd5389 +Subproject commit 04f42ceca40f73e2978b50e93806c2a18c1281fc