update SDL3 codepaths to work with 3.1.

src/common/macos.mm

@@ -129,7 +129,7 @@ void setWindowSRGBColorSpace(SDL_Window *window)
 		{
 #if SDL_VERSION_ATLEAST(3, 0, 0)
 			SDL_PropertiesID props = SDL_GetWindowProperties(window);
-			NSWindow *window = (__bridge NSWindow *) SDL_GetProperty(props, SDL_PROP_WINDOW_COCOA_WINDOW_POINTER, nullptr);
+			NSWindow *window = (__bridge NSWindow *) SDL_GetPointerProperty(props, SDL_PROP_WINDOW_COCOA_WINDOW_POINTER, nullptr);
 			window.colorSpace = [NSColorSpace sRGBColorSpace];
 #else
 			SDL_SysWMinfo info = {};

src/modules/event/sdl/Event.cpp

@@ -135,7 +135,12 @@ static void normalizedToDPICoords(double *x, double *y)
 // SDL's event watch callbacks trigger when the event is actually posted inside
 // SDL, unlike with SDL_PollEvents. This is useful for some events which require
 // handling inside the function which triggered them on some backends.
-static int SDLCALL watchAppEvents(void * /*udata*/, SDL_Event *event)
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+static bool
+#else
+static int
+#endif
+SDLCALL watchAppEvents(void * /*udata*/, SDL_Event *event)
 {
 	auto gfx = Module::getInstance<graphics::Graphics>(Module::M_GRAPHICS);
 
@@ -159,15 +164,23 @@ static int SDLCALL watchAppEvents(void * /*udata*/, SDL_Event *event)
 Event::Event()
 	: love::event::Event("love.event.sdl")
 {
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+	if (!SDL_InitSubSystem(SDL_INIT_EVENTS))
+#else
 	if (SDL_InitSubSystem(SDL_INIT_EVENTS) < 0)
+#endif
 		throw love::Exception("Could not initialize SDL events subsystem (%s)", SDL_GetError());
 
 	SDL_AddEventWatch(watchAppEvents, this);
 }
 
 Event::~Event()
 {
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+	SDL_RemoveEventWatch(watchAppEvents, this);
+#else
 	SDL_DelEventWatch(watchAppEvents, this);
+#endif
 	SDL_QuitSubSystem(SDL_INIT_EVENTS);
 }
 
@@ -194,7 +207,11 @@ Message *Event::wait()
 
 	SDL_Event e;
 
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+	if (!SDL_WaitEvent(&e))
+#else
 	if (SDL_WaitEvent(&e) != 1)
+#endif
 		return nullptr;
 
 	return convert(e);
@@ -256,11 +273,19 @@ Message *Event::convert(const SDL_Event &e)
 				break;
 		}
 
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+		love::keyboard::sdl::Keyboard::getConstant(e.key.key, key);
+#else
 		love::keyboard::sdl::Keyboard::getConstant(e.key.keysym.sym, key);
+#endif
 		if (!love::keyboard::Keyboard::getConstant(key, txt))
 			txt = "unknown";
 
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+		love::keyboard::sdl::Keyboard::getConstant(e.key.scancode, scancode);
+#else
 		love::keyboard::sdl::Keyboard::getConstant(e.key.keysym.scancode, scancode);
+#endif
 		if (!love::keyboard::Keyboard::getConstant(scancode, txt2))
 			txt2 = "unknown";
 
@@ -270,11 +295,19 @@ Message *Event::convert(const SDL_Event &e)
 		msg = new Message("keypressed", vargs);
 		break;
 	case SDL_EVENT_KEY_UP:
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+		love::keyboard::sdl::Keyboard::getConstant(e.key.key, key);
+#else
 		love::keyboard::sdl::Keyboard::getConstant(e.key.keysym.sym, key);
+#endif
 		if (!love::keyboard::Keyboard::getConstant(key, txt))
 			txt = "unknown";
 
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+		love::keyboard::sdl::Keyboard::getConstant(e.key.scancode, scancode);
+#else
 		love::keyboard::sdl::Keyboard::getConstant(e.key.keysym.scancode, scancode);
+#endif
 		if (!love::keyboard::Keyboard::getConstant(scancode, txt2))
 			txt2 = "unknown";
 
@@ -551,7 +584,7 @@ Message *Event::convert(const SDL_Event &e)
 			{
 				SDL_Sensor *sensor = (SDL_Sensor *) s;
 #if SDL_VERSION_ATLEAST(3, 0, 0)
-				SDL_SensorID id = SDL_GetSensorInstanceID(sensor);
+				SDL_SensorID id = SDL_GetSensorID(sensor);
 #else
 				SDL_SensorID id = SDL_SensorGetInstanceID(sensor);
 #endif

src/modules/filesystem/wrap_Filesystem.cpp

@@ -934,7 +934,11 @@ int extloader(lua_State *L)
 		}
 	}
 
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+	SDL_SharedObject *handle = nullptr;
+#else
 	void *handle = nullptr;
+#endif
 	auto *inst = instance();
 
 #ifdef LOVE_ANDROID

src/modules/joystick/sdl/JoystickModule.cpp

@@ -44,7 +44,7 @@ JoystickModule::JoystickModule()
 	: love::joystick::JoystickModule("love.joystick.sdl")
 {
 #if SDL_VERSION_ATLEAST(3, 0, 0)
-	if (SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD) < 0)
+	if (!SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD))
 #else
 	if (SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) < 0)
 #endif
@@ -60,8 +60,8 @@ JoystickModule::JoystickModule()
 
 	// Start joystick event watching. Joysticks are automatically added and
 	// removed via love.event.
-	SDL_SetJoystickEventsEnabled(SDL_TRUE);
-	SDL_SetGamepadEventsEnabled(SDL_TRUE);
+	SDL_SetJoystickEventsEnabled(true);
+	SDL_SetGamepadEventsEnabled(true);
 #else
 	for (int i = 0; i < SDL_NumJoysticks(); i++)
 		addJoystick(i);
@@ -215,7 +215,7 @@ bool JoystickModule::setGamepadMapping(const std::string &guid, Joystick::Gamepa
 		throw love::Exception("Invalid joystick GUID: %s", guid.c_str());
 
 #if SDL_VERSION_ATLEAST(3, 0, 0)
-	SDL_JoystickGUID sdlguid = SDL_GetJoystickGUIDFromString(guid.c_str());
+	SDL_GUID sdlguid = SDL_StringToGUID(guid.c_str());
 	std::string mapstr;
 
 	char *sdlmapstr = SDL_GetGamepadMappingForGUID(sdlguid);
@@ -468,8 +468,8 @@ std::string JoystickModule::getDeviceGUID(int64 deviceid) const
 		return std::string("");
 
 	// SDL's GUIDs identify *classes* of devices, instead of unique devices.
-	SDL_JoystickGUID guid = SDL_GetJoystickInstanceGUID((SDL_JoystickID)deviceid);
-	SDL_GetJoystickGUIDString(guid, guidstr, sizeof(guidstr));
+	SDL_GUID guid = SDL_GetJoystickGUIDForID((SDL_JoystickID)deviceid);
+	SDL_GUIDToString(guid, guidstr, sizeof(guidstr));
 #else
 	int deviceindex = (int) deviceid;
 	if (deviceindex < 0 || deviceindex >= SDL_NumJoysticks())
@@ -548,7 +548,7 @@ void JoystickModule::loadGamepadMappings(const std::string &mappings)
 std::string JoystickModule::getGamepadMappingString(const std::string &guid) const
 {
 #if SDL_VERSION_ATLEAST(3, 0, 0)
-	SDL_JoystickGUID sdlguid = SDL_GetJoystickGUIDFromString(guid.c_str());
+	SDL_GUID sdlguid = SDL_StringToGUID(guid.c_str());
 	char *sdlmapping = SDL_GetGamepadMappingForGUID(sdlguid);
 #else
 	SDL_JoystickGUID sdlguid = SDL_JoystickGetGUIDFromString(guid.c_str());
@@ -577,7 +577,7 @@ std::string JoystickModule::saveGamepadMappings()
 	for (const auto &g : recentGamepadGUIDs)
 	{
 #if SDL_VERSION_ATLEAST(3, 0, 0)
-		SDL_JoystickGUID sdlguid = SDL_GetJoystickGUIDFromString(g.first.c_str());
+		SDL_GUID sdlguid = SDL_StringToGUID(g.first.c_str());
 		char *sdlmapping = SDL_GetGamepadMappingForGUID(sdlguid);
 #else
 		SDL_JoystickGUID sdlguid = SDL_JoystickGetGUIDFromString(g.first.c_str());

src/modules/joystick/sdl/JoystickSDL3.cpp

@@ -29,6 +29,8 @@
 
 #if SDL_VERSION_ATLEAST(3, 0, 0)
 
+#include <SDL_guid.h>
+
 // C++
 #include <algorithm>
 #include <limits>
@@ -62,13 +64,13 @@ bool Joystick::open(int64 deviceid)
 
 	if (joyhandle)
 	{
-		instanceid = SDL_GetJoystickInstanceID(joyhandle);
+		instanceid = SDL_GetJoystickID(joyhandle);
 
 		// SDL_JoystickGetGUIDString uses 32 bytes plus the null terminator.
 		char cstr[33];
 
-		SDL_JoystickGUID sdlguid = SDL_GetJoystickGUID(joyhandle);
-		SDL_GetJoystickGUIDString(sdlguid, cstr, (int) sizeof(cstr));
+		SDL_GUID sdlguid = SDL_GetJoystickGUID(joyhandle);
+		SDL_GUIDToString(sdlguid, cstr, (int) sizeof(cstr));
 
 		pguid = std::string(cstr);
 
@@ -212,7 +214,7 @@ bool Joystick::isDown(const std::vector<int> &buttonlist) const
 		if (button < 0 || button >= numbuttons)
 			continue;
 
-		if (SDL_GetJoystickButton(joyhandle, button) == 1)
+		if (SDL_GetJoystickButton(joyhandle, button))
 			return true;
 	}
 
@@ -304,7 +306,7 @@ bool Joystick::isGamepadDown(const std::vector<GamepadButton> &blist) const
 		if (!getConstant(button, sdlbutton))
 			continue;
 
-		if (SDL_GetGamepadButton(controller, sdlbutton) == 1)
+		if (SDL_GetGamepadButton(controller, sdlbutton))
 			return true;
 	}
 
@@ -382,7 +384,7 @@ std::string Joystick::getGamepadMappingString() const
 
 	if (sdlmapping == nullptr)
 	{
-		SDL_JoystickGUID sdlguid = SDL_GetJoystickGUIDFromString(pguid.c_str());
+		SDL_GUID sdlguid = SDL_StringToGUID(pguid.c_str());
 		sdlmapping = SDL_GetGamepadMappingForGUID(sdlguid);
 	}
 
@@ -445,7 +447,7 @@ bool Joystick::isVibrationSupported()
 		return false;
 
 	SDL_PropertiesID props = SDL_GetJoystickProperties(joyhandle);
-	return SDL_GetBooleanProperty(props, SDL_PROP_JOYSTICK_CAP_RUMBLE_BOOLEAN, SDL_FALSE);
+	return SDL_GetBooleanProperty(props, SDL_PROP_JOYSTICK_CAP_RUMBLE_BOOLEAN, false);
 }
 
 bool Joystick::setVibration(float left, float right, float duration)
@@ -489,7 +491,7 @@ bool Joystick::hasSensor(Sensor::SensorType type) const
 	if (!isGamepad())
 		return false;
 
-	return SDL_GamepadHasSensor(controller, SDLSensor::convert(type)) == SDL_TRUE;
+	return SDL_GamepadHasSensor(controller, SDLSensor::convert(type));
 #else
 	return false;
 #endif
@@ -503,7 +505,7 @@ bool Joystick::isSensorEnabled(Sensor::SensorType type) const
 	if (!isGamepad())
 		return false;
 
-	return SDL_GamepadSensorEnabled(controller, SDLSensor::convert(type)) == SDL_TRUE;
+	return SDL_GamepadSensorEnabled(controller, SDLSensor::convert(type));
 #else
 	return false;
 #endif
@@ -517,7 +519,7 @@ void Joystick::setSensorEnabled(Sensor::SensorType type, bool enabled)
 	if (!isGamepad())
 		throw love::Exception("Sensor is only supported on gamepad");
 
-	if (SDL_SetGamepadSensorEnabled(controller, SDLSensor::convert(type), enabled ? SDL_TRUE : SDL_FALSE) != 0)
+	if (!SDL_SetGamepadSensorEnabled(controller, SDLSensor::convert(type), enabled))
 	{
 		const char *name = nullptr;
 		SDLSensor::getConstant(type, name);
@@ -547,7 +549,7 @@ std::vector<float> Joystick::getSensorData(Sensor::SensorType type) const
 		throw love::Exception("\"%s\" gamepad sensor is not enabled", name);
 	}
 
-	if (SDL_GetGamepadSensorData(controller, SDLSensor::convert(type), data.data(), (int) data.size()) != 0)
+	if (!SDL_GetGamepadSensorData(controller, SDLSensor::convert(type), data.data(), (int) data.size()))
 	{
 		const char *name = nullptr;
 		SDLSensor::getConstant(type, name);