Moved a bunch of code around

src/dusksdl2/CMakeLists.txt

@@ -9,4 +9,5 @@ target_include_directories(${DUSK_LIBRARY_TARGET_NAME}
     ${CMAKE_CURRENT_LIST_DIR}
 )
 
-# Subdirs
+# Subdirs
+add_subdirectory(display)

src/dusksdl2/display/CMakeLists.txt

@@ -0,0 +1,12 @@
+# Copyright (c) 2026 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    displaysdl2.c
+)
+
+# Subdirs

src/dusksdl2/display/displaysdl2.c

@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "display/display.h"
+#include "engine/engine.h"
+#include "display/displaygl.h"
+
+erroret_t displaySDL2Init(void) {
+  uint32_t flags = SDL_INIT_VIDEO;
+  #if INPUT_GAMEPAD == 1
+    flags |= SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK;
+  #endif
+  if(SDL_Init(flags) != 0) {
+    errorThrow("SDL Failed to Initialize: %s", SDL_GetError());
+  }
+
+  // Set OpenGL attributes (Needs to be done now or later?)
+  SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+
+  // Create window with OpenGL flag.
+  DISPLAY.window = SDL_CreateWindow(
+    "Dusk",
+    SDL_WINDOWPOS_UNDEFINED,
+    SDL_WINDOWPOS_UNDEFINED,
+    DUSK_WINDOW_WIDTH_DEFAULT,
+    DUSK_WINDOW_HEIGHT_DEFAULT,
+    SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI |
+    SDL_WINDOW_OPENGL
+  );
+  if(!DISPLAY.window) {
+    errorThrow("SDL_CreateWindow failed: %s", SDL_GetError());
+  }
+
+  // Create OpenGL context
+  DISPLAY.glContext = SDL_GL_CreateContext(DISPLAY.window);
+  if(!DISPLAY.glContext) {
+    errorThrow("SDL_GL_CreateContext failed: %s", SDL_GetError());
+  }
+  errorChain(errorGLCheck());
+
+  SDL_GL_SetSwapInterval(1);
+  SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
+  errorChain(errorGLCheck());
+
+  errorChain(displayOpenGLInit());
+
+
+  // #if DUSK_PSP
+  //   errorChain(displayPSPInit());
+  // #endif
+  
+  errorChain(errorGLCheck());
+}
+
+errorret_t displaySDL2Update(void) {
+  SDL_Event event;
+  while(SDL_PollEvent(&event)) {
+    switch(event.type) {
+      case SDL_QUIT: {
+        ENGINE.running = false;
+        break;
+      }
+
+      case SDL_WINDOWEVENT: {
+        switch(event.window.event) {
+          case SDL_WINDOWEVENT_CLOSE: {
+            ENGINE.running = false;
+            break;
+          }
+          
+          default: {
+            break;
+          }
+        }
+      }
+
+      default: {
+        break;
+      }
+    }
+  }
+
+  SDL_GL_MakeCurrent(DISPLAY.window, DISPLAY.glContext);
+  errorOk();
+}
+
+errorret_t displaySDL2Swap(void) {
+  SDL_GL_SwapWindow(DISPLAY.window);
+
+  GLenum err;
+  while((err = glGetError()) != GL_NO_ERROR) {
+    debugPrint("GL Error: %d\n", err);
+  }
+  errorOk();
+}
+
+void displaySDL2Dispose(void) {
+  if(DISPLAY.glContext) {
+    SDL_GL_DeleteContext(DISPLAY.glContext);
+    DISPLAY.glContext = NULL;
+  }
+  if(DISPLAY.window) {
+    SDL_DestroyWindow(DISPLAY.window);
+    DISPLAY.window = NULL;
+  }
+  SDL_Quit();
+}

src/dusksdl2/display/displaysdl2.h

@@ -6,10 +6,30 @@
  */
 
 #pragma once
-#include "dusk.h"
+#include "error/error.h"
 
 typedef struct {
   SDL_Window *window;
   SDL_GLContext glContext;
   bool_t usingShaderedPalettes;
-} displayplatform_t;
+} displaysdl2_t;
+
+/**
+ * Initializes the SDL2 display system.
+ */
+errorret_t displaySDL2Init(void);
+
+/**
+ * Handles SDL2 Updating (pre-render context initialization)
+ */
+errorret_t displaySDL2Update(void);
+
+/**
+ * Handles SDL2 Display Swapping (to switch from frontbuffer to backbuffer).
+ */
+errorret_t displaySDL2Swap(void);
+
+/**
+ * Disposes/Cleans up the SDL2 Render system.
+ */
+void displaySDL2Dispose(void);

src/dusksdl2/dusksdl2.h

@@ -6,4 +6,5 @@
  */
 
 #pragma once
-#include "duskopengl.h"
+#include <SDL2/SDL.h>
+#include "duskgl.h"