Basic sdl3 support.

CMakeLists.txt

@@ -16,7 +16,7 @@ option( LUA_EVENTS "Enable Lua event callbacks (RL.event)." off )
 option( DYNAMIC_SYMBOLS "Expose all dynamic symbols with rdynamic." off )
 option( EXPOSE_API_SYMBOLS "Expose dynamic symbols only for get and push functions of variable types." off )
 
-enum_option( PLATFORM "Desktop;Desktop_SDL;Web" "Platform to build for." )
+enum_option( PLATFORM "Desktop;Desktop_SDL2;Desktop_SDL3;Web" "Platform to build for." )
 
 if( NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES )
 	set( CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE )
@@ -30,8 +30,10 @@ add_executable( ${PROJECT_NAME} ${SOURCES} )
 
 if( PLATFORM STREQUAL "Desktop" )
 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_DESKTOP" )
-elseif( PLATFORM STREQUAL "Desktop_SDL" )
+elseif( PLATFORM STREQUAL "Desktop_SDL2" )
-	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_DESKTOP_SDL" )
+	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_DESKTOP_SDL2" )
+elseif( PLATFORM STREQUAL "Desktop_SDL3" )
+	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_DESKTOP_SDL3" )
 elseif( PLATFORM STREQUAL "Web" )
 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WEB" )
 endif()
@@ -86,11 +88,16 @@ else() # Desktop
 			set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DEXPOSE_LUA_API_SYMBOLS -rdynamic -fvisibility=hidden" )
 		endif()
 
-		if ( PLATFORM MATCHES "Desktop_SDL" )
+		if ( PLATFORM MATCHES "Desktop_SDL2" )
 			include( FindPkgConfig )
 			pkg_search_module( SDL2 REQUIRED sdl2 )
 			include_directories( ${SDL2_INCLUDE_DIRS} )
 			target_link_libraries( ${PROJECT_NAME} ${SDL2_LIBRARIES} )
+		elseif ( PLATFORM MATCHES "Desktop_SDL3" )
+			include( FindPkgConfig )
+			pkg_search_module( SDL3 REQUIRED sdl3 )
+			include_directories( ${SDL3_INCLUDE_DIRS} )
+			target_link_libraries( ${PROJECT_NAME} ${SDL3_LIBRARIES} )
 		endif()
 
 		if( DRM ) # For Raspberry Pi.
@@ -104,7 +111,7 @@ else() # Desktop
 	elseif( APPLE )
 		set( CMAKE_C_COMPILER "clang" )
 
-		# //TODO Linking to sdl2.
+		# //TODO Linking to SDL.
 
 		target_link_libraries( ${PROJECT_NAME} "-framework IOKit" )
 		target_link_libraries( ${PROJECT_NAME} "-framework Cocoa" )
@@ -114,11 +121,16 @@ else() # Desktop
 			set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DEXPOSE_LUA_API_SYMBOLS" )
 		endif()
 
-		if ( PLATFORM MATCHES "Desktop_SDL" )
+		if ( PLATFORM MATCHES "Desktop_SDL2" )
 			find_package( SDL2 REQUIRED )
 			include_directories( ${SDL2_INCLUDE_DIRS} )
 			target_link_libraries( ${PROJECT_NAME} ${SDL2MAIN_LIBRARIES} )
 			target_link_libraries( ${PROJECT_NAME} ${SDL2_LIBRARIES} )
+		elseif ( PLATFORM MATCHES "Desktop_SDL3" )
+			find_package( SDL3 REQUIRED )
+			include_directories( ${SDL3_INCLUDE_DIRS} )
+			target_link_libraries( ${PROJECT_NAME} ${SDL3MAIN_LIBRARIES} )
+			target_link_libraries( ${PROJECT_NAME} ${SDL3_LIBRARIES} )
 		endif()
 		# Remove this to get console. //TODO Could be build option.
 		set( CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-mwindows" )

include/main.h

@@ -17,8 +17,10 @@
 #ifdef PLATFORM_DESKTOP
 	#include "GLFW/glfw3.h"
 	#include "GLFW/glfw3native.h"
-#elif PLATFORM_DESKTOP_SDL
+#elif PLATFORM_DESKTOP_SDL2
-	#include <SDL.h>
+	#include <SDL2/SDL.h>
+#elif PLATFORM_DESKTOP_SDL3
+	#include <SDL3/SDL.h>
 #endif
 
 #ifdef SHARED

include/platforms/core_desktop_sdl3.h

@@ -0,0 +1,3 @@
+#pragma once
+
+#include "SDL3/SDL.h"

include/state.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef PLATFORM_DESKTOP_SDL
+#ifdef PLATFORM_DESKTOP_SDL2
 	#define PLATFORM_SDL_EVENT_QUEUE_LEN 128
 #endif
 
@@ -39,7 +39,7 @@ typedef struct {
 	GLFWpentabletdatafun glfwTabletDataCallback;
 	GLFWpentabletcursorfun glfwTabletCursorCallback;
 	GLFWpentabletproximityfun glfwTabletProximityCallback;
-#elif PLATFORM_DESKTOP_SDL
+#elif PLATFORM_DESKTOP_SDL2
 	int SDL_eventQueueLen;
 	SDL_Event* SDL_eventQueue;
 #endif

src/gl.c

@@ -32,7 +32,7 @@ Copy a block of pixels from one framebuffer object to another.
 Use nil RenderTexture for window framebuffer
 */
 int lglBlitFramebuffer( lua_State* L ) {
-#if defined( PLATFORM_DESKTOP ) || defined( PLATFORM_DESKTOP_SDL )
+#if defined( PLATFORM_DESKTOP ) || defined( PLATFORM_DESKTOP_SDL2 ) || defined( PLATFORM_DESKTOP_SDL3 )
 	if ( !( lua_isuserdata( L, 1 ) || lua_isnil( L, 1 ) ) || !( lua_isuserdata( L, 2 ) || lua_isnil( L, 2 ) ) ) {
 		TraceLog( state->logLevelInvalid, "%s", "Argument needs to be RenderTexture or nil" );
 		lua_pushnil( L );

src/lua_core.c

@@ -17,8 +17,10 @@
 
 #ifdef PLATFORM_DESKTOP
 	#include "platforms/core_desktop_glfw.c"
-#elif PLATFORM_DESKTOP_SDL
+#elif PLATFORM_DESKTOP_SDL2
-	#include "platforms/core_desktop_sdl.c"
+	#include "platforms/core_desktop_sdl2.c"
+#elif PLATFORM_DESKTOP_SDL3
+	#include "platforms/core_desktop_sdl3.c"
 #elif PLATFORM_WEB
 	#include "platforms/core_web.c"
 #endif
@@ -1451,7 +1453,7 @@ void luaCallInit() {
 
 
 void luaCallUpdate() {
-#if defined PLATFORM_DESKTOP_SDL && defined LUA_EVENTS
+#if defined PLATFORM_DESKTOP_SDL2 && defined LUA_EVENTS
 	platformSendEvents();
 #endif
 	lua_State* L = state->luaState;

src/platforms/core_desktop_sdl2.c

@@ -1,7 +1,7 @@
 #include "main.h"
 #include "lua_core.h"
 #include "core.h"
-#include "platforms/core_desktop_sdl.h"
+#include "platforms/core_desktop_sdl2.h"
 
 void platformDefineGlobals() {
 	lua_State* L = state->luaState;

src/platforms/core_desktop_sdl3.c

@@ -0,0 +1,23 @@
+#include "main.h"
+#include "lua_core.h"
+#include "core.h"
+#include "platforms/core_desktop_sdl3.h"
+
+void platformDefineGlobals() {
+	lua_State* L = state->luaState;
+
+	lua_getglobal( L, "RL" );
+/*DOC_DEFINES_START*/
+/*DOC_DEFINES_END*/
+	lua_pop( L, -1 );
+}
+
+void luaPlatformRegister() {
+	// lua_State* L = state->luaState;
+	// lua_getglobal( L, "RL" );
+
+	// lua_pop( L, -1 );
+#ifdef LUA_EVENTS
+	// platformRegisterEvents();
+#endif
+}

src/state.c

@@ -29,7 +29,7 @@ void stateContextInit() {
 	state->defaultTexture = (Texture){ 1, 1, 1, 1, 7 };
 	state->shapesTexture = (Texture){ 1, 1, 1, 1, 7 };
 	state->RLGLcurrentShaderLocs = malloc( RL_MAX_SHADER_LOCATIONS * sizeof( int ) );
-#ifdef PLATFORM_DESKTOP_SDL
+#ifdef PLATFORM_DESKTOP_SDL2
 	state->SDL_eventQueue = malloc( PLATFORM_SDL_EVENT_QUEUE_LEN * sizeof( SDL_Event ) );
 	state->SDL_eventQueueLen = 0;
 #endif