sdl3

Author: jgilchrist

CMakeLists.txt

@@ -24,12 +24,11 @@ declare_library(gbemu-core src)
 # endif()
 
 # SDL target
-find_package(SDL2)
+find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3)
 
-if (SDL2_FOUND)
+if (SDL3_FOUND)
   declare_executable(gbemu platforms/sdl)
-  include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
-  target_link_libraries(gbemu gbemu-core ${SDL2_LIBRARIES})
+  target_link_libraries(gbemu PRIVATE gbemu-core PRIVATE SDL3::SDL3)
 endif()
 
 # Test target

platforms/sdl/main.cc

@@ -1,7 +1,7 @@
 #include "../../src/gameboy_prelude.h"
 #include "../cli/cli.h"
 
-#include <SDL.h>
+#include <SDL3/SDL.h>
 
 #include <fstream>
 #include <iterator>
@@ -28,13 +28,13 @@ static std::optional<GbButton> get_gb_button(int keyCode) {
         case SDLK_DOWN: return GbButton::Down;
         case SDLK_LEFT: return GbButton::Left;
         case SDLK_RIGHT: return GbButton::Right;
-        case SDLK_x: return GbButton::A;
-        case SDLK_z: return GbButton::B;
+        case SDLK_X: return GbButton::A;
+        case SDLK_Z: return GbButton::B;
         case SDLK_BACKSPACE: return GbButton::Select;
         case SDLK_RETURN: return GbButton::Start;
-        case SDLK_b: gameboy->debug_toggle_background(); return {};
-        case SDLK_s: gameboy->debug_toggle_sprites(); return {};
-        case SDLK_w: gameboy->debug_toggle_window(); return {};
+        case SDLK_B: gameboy->debug_toggle_background(); return {};
+        case SDLK_S: gameboy->debug_toggle_sprites(); return {};
+        case SDLK_W: gameboy->debug_toggle_window(); return {};
         default: return {};
     }
 }
@@ -113,24 +113,22 @@ static void process_events() {
 
     while (SDL_PollEvent(&event)) {
         switch (event.type) {
-            case SDL_KEYDOWN:
+            case SDL_EVENT_KEY_DOWN:
                 if (event.key.repeat == true) { break; }
-                if (auto button_pressed = get_gb_button(event.key.keysym.sym); button_pressed) {
+                if (auto button_pressed = get_gb_button(event.key.key); button_pressed) {
                     gameboy->button_pressed(*button_pressed);
                 }
                 break;
-            case SDL_KEYUP:
+            case SDL_EVENT_KEY_UP:
                 if (event.key.repeat == true) { break; }
-                if (auto button_released = get_gb_button(event.key.keysym.sym); button_released) {
+                if (auto button_released = get_gb_button(event.key.key); button_released) {
                     gameboy->button_released(*button_released);
                 }
                 break;
-            case SDL_WINDOWEVENT:
-                if (event.window.event == SDL_WINDOWEVENT_CLOSE) {
-                    should_exit = true;
-                }
+            case SDL_EVENT_WINDOW_CLOSE_REQUESTED:
+                should_exit = true;
                 break;
-            case SDL_QUIT:
+            case SDL_EVENT_QUIT:
                 should_exit = true;
                 break;
         }
@@ -150,7 +148,7 @@ static void draw(const FrameBuffer& buffer) {
     set_pixels(pixels, buffer);
     SDL_UnlockTexture(gb_screen_texture);
 
-    SDL_RenderCopy(renderer, gb_screen_texture, nullptr, nullptr);
+    SDL_RenderTexture(renderer, gb_screen_texture, nullptr, nullptr);
     SDL_RenderPresent(renderer);
 }
 
@@ -165,8 +163,6 @@ int main(int argc, char* argv[]) {
 
     window = SDL_CreateWindow(
         "gbemu",
-        SDL_WINDOWPOS_UNDEFINED,
-        SDL_WINDOWPOS_UNDEFINED,
         width,
         height,
         SDL_WINDOW_OPENGL
@@ -176,7 +172,7 @@ int main(int argc, char* argv[]) {
         fatal_error("Failed to initialise SDL");
     }
 
-    renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
+    renderer = SDL_CreateRenderer(window, nullptr);
 
     gb_screen_texture = SDL_CreateTexture(
         renderer,