Migration to SDL3.

.gitmodules

@@ -72,7 +72,7 @@
 	url = https://github.com/mity/md4c.git
 [submodule "third_party/imgui_md"]
 	path = third_party/imgui_md
-	url = https://github.com/mekhontsev/imgui_md.git
+	url = https://github.com/grumpycoders/imgui_md.git
 [submodule "third_party/multipart-parser-c"]
 	path = third_party/multipart-parser-c
 	url = https://github.com/iafonov/multipart-parser-c
@@ -100,3 +100,6 @@
 [submodule "third_party/psxlua"]
 	path = third_party/psxlua
 	url = https://github.com/grumpycoders/psxlua.git
+[submodule "third_party/SDL"]
+	path = third_party/SDL
+	url = https://github.com/libsdl-org/SDL.git

Makefile

@@ -8,7 +8,7 @@ UNAME_M := $(shell uname -m)
 rwildcard = $(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
 CC_IS_CLANG := $(shell $(CC) --version | grep -q clang && echo true || echo false)
 
-PACKAGES := capstone freetype2 glfw3 libavcodec libavformat libavutil libswresample libcurl libuv zlib
+PACKAGES := capstone freetype2 libavcodec libavformat libavutil libswresample libcurl libuv sdl3 zlib
 OPTIONAL_PACKAGES := md4c fmt libllhttp libluv liburiparser
 OPTIONAL_LIBRARIES := multipart ucl
 
@@ -124,7 +124,7 @@ SRCS += third_party/gl3w/GL/gl3w-throwers.cc
 SRCS += $(wildcard third_party/iec-60908b/*.c)
 SRCS += third_party/ImFileDialog/ImFileDialog.cpp
 SRCS += third_party/imgui/backends/imgui_impl_opengl3.cpp
-SRCS += third_party/imgui/backends/imgui_impl_glfw.cpp
+SRCS += third_party/imgui/backends/imgui_impl_sdl3.cpp
 SRCS += third_party/imgui/misc/cpp/imgui_stdlib.cpp
 SRCS += third_party/imgui/misc/freetype/imgui_freetype.cpp
 SRCS += third_party/imgui_lua_bindings/imgui_lua_bindings.cpp

src/forced-includes/imgui.h

@@ -30,7 +30,31 @@ void pcsxStaticImguiAssert(int exp, const char* expression);
 }
 #endif
 
-#define IM_ASSERT_USER_ERROR(EXP, MSG) \
-    if (!(EXP)) pcsxStaticImguiUserError((MSG))
+// imgui_internal.h gates IM_ASSERT_USER_ERROR_RET and IM_ASSERT_USER_ERROR_RETV
+// behind the same #ifndef IM_ASSERT_USER_ERROR guard, so once we redirect the
+// base macro we have to provide the recoverable-error variants as well.
+// pcsxStaticImguiUserError throws by default, so the return statements after
+// it are unreachable in normal operation but required for syntactic
+// correctness when the user handler is replaced with a non-throwing one.
+#define IM_ASSERT_USER_ERROR(EXP, MSG)               \
+    do {                                             \
+        if (!(EXP)) pcsxStaticImguiUserError((MSG)); \
+    } while (0)
+
+#define IM_ASSERT_USER_ERROR_RET(EXP, MSG)     \
+    do {                                       \
+        if (!(EXP)) {                          \
+            pcsxStaticImguiUserError((MSG));   \
+            return;                            \
+        }                                      \
+    } while (0)
+
+#define IM_ASSERT_USER_ERROR_RETV(EXP, RETV, MSG) \
+    do {                                          \
+        if (!(EXP)) {                             \
+            pcsxStaticImguiUserError((MSG));      \
+            return (RETV);                        \
+        }                                         \
+    } while (0)
 
 #define IM_ASSERT(EXP) pcsxStaticImguiAssert(!!(EXP), "ImGui assert: " #EXP " is false")