Update ImGui

external/imgui/CMakeLists.txt

@@ -7,11 +7,13 @@ add_library(imgui
   imgui/imgui.cpp
   imgui/imgui.h
   imgui/imconfig.h
-  imgui/backends/imgui_impl_sdl.h
+  imgui/backends/imgui_impl_sdl2.h
-  imgui/backends/imgui_impl_sdl.cpp
+  imgui/backends/imgui_impl_sdl2.cpp
   imgui/backends/imgui_impl_vulkan.h
   imgui/backends/imgui_impl_vulkan.cpp)
 
+add_compile_definitions(IMGUI_IMPL_VULKAN_NO_PROTOTYPES)
+
 if(WIN32)
   target_compile_definitions(imgui PUBLIC NOMINMAX _CRT_SECURE_NO_WARNINGS)
   if(MSVC)

src/frontend/imgui/CMakeLists.txt

@@ -1,4 +1,8 @@
 file(GLOB SOURCES *.cpp)
 file(GLOB HEADERS *.hpp)
 
+if(WIN32)
+  add_compile_definitions(SDL_MAIN_HANDLED)
+endif()
+
 add_library(frontend-imgui ${SOURCES} ${HEADERS})

src/frontend/imgui/Window.cpp

@@ -3,7 +3,6 @@
 #include <nfd.hpp>
 #include <Core.hpp>
 #include <Audio.hpp>
-#define SDL_MAIN_HANDLED
 #include <SDL2/SDL.h>
 #include <Discord.hpp>
 
@@ -22,6 +21,12 @@ Window::Window(n64::Core& core) : settings(core) {
       && event.window.windowID == SDL_GetWindowID(window);
 }
 
+static void check_vk_result(VkResult err) {
+  if (err) {
+    Util::panic("[vulkan] Error: VkResult = {}", err);
+  }
+}
+
 void Window::InitSDL() {
   SDL_Init(SDL_INIT_EVERYTHING);
   n64::InitAudio();
@@ -35,15 +40,7 @@ void Window::InitSDL() {
     SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI
   );
 
-  if(volkInitialize() != VK_SUCCESS) {
+  check_vk_result(volkInitialize());
-    Util::panic("Failed to load Volk!");
-  }
-}
-
-static void check_vk_result(VkResult err) {
-  if (err) {
-    Util::panic("[vulkan] Error: VkResult = {}", err);
-  }
 }
 
 void Window::InitImgui() {

src/frontend/imgui/Window.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <ParallelRDPWrapper.hpp>
 #include <imgui.h>
-#include <imgui_impl_sdl.h>
+#include <imgui_impl_sdl2.h>
 #include <imgui_impl_vulkan.h>
 #include <SDL2/SDL.h>
 #include <backend/Core.hpp>