eden-emu/eden
24
8
Fork 31
Code Issues 108 Pull requests 107 Projects 2 Releases 12 Wiki Activity Actions

WIP: [common] port to SDL3 #2645

Closed
octocar wants to merge 16 commits from octocar/eden:sdl3 into master
pull from: octocar/eden:sdl3
merge into: eden-emu:master
Conversation 13 Commits 16 Files changed 41 +735 -738
octocar commented 2025-10-01 21:55:08 +02:00
First-time contributor
Copy link
No description provided.
octocar changed title from [common] port to SDL3 to WIP: [common] port to SDL3 2025-10-01 21:56:38 +02:00
octocar force-pushed sdl3 from dce3d96aaa
Some checks failed
eden-license / license-header (pull_request) Failing after 24s
Details
to 726fe8cf09
Some checks failed
eden-license / license-header (pull_request) Failing after 30s
Details
2025-10-01 22:04:10 +02:00 Compare
crueter requested changes 2025-10-01 22:08:57 +02:00
CMakeLists.txt Outdated
@ -635,16 +635,16 @@ if (ENABLE_SDL2)
if ("${YUZU_SYSTEM_PROFILE}" STREQUAL "steamdeck")
crueter commented 2025-10-01 21:59:29 +02:00
Owner
Copy link

this is now unneeded

this is now unneeded
octocar marked this conversation as resolved
CMakeLists.txt Outdated
@ -645,3 +645,3 @@
endif()
find_package(SDL2 2.26.4 REQUIRED)
find_package(SDL3 3.2.22 REQUIRED)
crueter commented 2025-10-01 22:02:56 +02:00
Owner
Copy link

DO NOT always require the newest, we should use 3.2.12 which is the earliest found in any current distro except Ubuntu (which lacks sdl3 entirely)

DO NOT always require the newest, we should use 3.2.12 which is the earliest found in any current distro except Ubuntu (which lacks sdl3 entirely)
octocar marked this conversation as resolved
cpmfile.json Outdated
@ -184,0 +180,4 @@
"repo": "libsdl-org/SDL3",
"version": "3.2.22",
"min_version": "3.2.0",
"cmake_filename": "sdl3"
crueter commented 2025-10-01 22:03:28 +02:00
Owner
Copy link

This is a special CI repo and should be left as it previously was, I will create an SDL3 CI

This is a special CI repo and should be left as it previously was, I will create an SDL3 CI
octocar marked this conversation as resolved
docs/Deps.md Outdated
@ -33,3 +33,3 @@
* [FFmpeg](https://ffmpeg.org/) (should use `-DYUZU_USE_EXTERNAL_FFMPEG=ON`)
* [SDL2](https://www.libsdl.org/download-2.0.php) 2.0.18+ (should use `-DYUZU_USE_EXTERNAL_SDL2=ON` OR `-DYUZU_USE_BUNDLED_SDL2=ON` to reduce compile time)
* [SDL3](https://github.com/libsdl-org/SDL/releases) 2.0.18+ (should use `-DYUZU_USE_EXTERNAL_SDL3=ON` OR `-DYUZU_USE_BUNDLED_SDL3=ON` to reduce compile time)
crueter commented 2025-10-01 22:03:52 +02:00
Owner
Copy link

change to 3.2.12+

change to 3.2.12+
octocar marked this conversation as resolved
docs/Deps.md Outdated
@ -203,3 +203,3 @@
* Open the `MSYS2 MinGW 64-bit` shell (`mingw64.exe`)
* Download and install all dependencies using:
* `pacman -Syu git make mingw-w64-x86_64-SDL2 mingw-w64-x86_64-cmake mingw-w64-x86_64-python-pip mingw-w64-x86_64-qt6 mingw-w64-x86_64-toolchain autoconf libtool automake-wrapper`
* `pacman -Syu git make mingw-w64-x86_64-SDL3 mingw-w64-x86_64-cmake mingw-w64-x86_64-python-pip mingw-w64-x86_64-qt6 mingw-w64-x86_64-toolchain autoconf libtool automake-wrapper`
crueter commented 2025-10-01 22:04:34 +02:00
Owner
Copy link

sdl is now lower case here

sdl is now lower case here
octocar marked this conversation as resolved
src/audio_core/CMakeLists.txt Outdated
@ -251,3 +250,4 @@
if (ENABLE_SDL3)
target_sources(audio_core PRIVATE
sink/sdl2_sink.cpp
sink/sdl2_sink.h
crueter commented 2025-10-01 22:04:54 +02:00
Owner
Copy link

Update filenames to sdl3

Update filenames to sdl3
octocar marked this conversation as resolved
src/audio_core/sink/sdl2_sink.cpp Outdated
@ -8,3 +9,3 @@
#include <vector>
#include <SDL.h>
#include <SDL3/SDL.h>
crueter commented 2025-10-01 22:05:12 +02:00
Owner
Copy link

This shouldn't be necessary

This shouldn't be necessary
octocar marked this conversation as resolved
src/input_common/drivers/sdl_driver.cpp Outdated
@ -9,3 +9,3 @@
#include "common/settings.h"
#include "common/thread.h"
#include "common/vector_math.h"
// #include "common/vector_math.h" // Not used directly
crueter commented 2025-10-01 22:06:02 +02:00
Owner
Copy link

If it's not used you can remove it, no need for comment

If it's not used you can remove it, no need for comment
octocar marked this conversation as resolved
crueter reviewed 2025-10-01 23:08:00 +02:00
crueter left a comment
Owner
Copy link

Also, we should update docs to mention that Ubuntu needs to use bundled or external sdl3

Also, we should update docs to mention that Ubuntu needs to use bundled or external sdl3
crueter reviewed 2025-10-01 23:08:06 +02:00
src/audio_core/sink/sdl3_sink.cpp Outdated
@ -0,0 +8,4 @@
#include <span>
#include <vector>
#include <SDL3/SDL.h>
crueter commented 2025-10-01 23:08:06 +02:00
Owner
Copy link

Linking to SDL3::SDL3 should set the include directories to include the /path/to/include/SDL3 so SDL.h should still work.

Linking to SDL3::SDL3 *should* set the include directories to include the `/path/to/include/SDL3` so SDL.h should still work.
octocar commented 2025-10-02 10:59:41 +02:00
Author
First-time contributor
Copy link

SDL.h does not seem to work for me on external dependency

SDL.h does not seem to work for me on external dependency
crueter marked this conversation as resolved
MaranBr force-pushed sdl3 from af6c90e3ff
Some checks failed
eden-license / license-header (pull_request) Failing after 58m45s
Details
to 4c5aaf7f13
Some checks failed
eden-license / license-header (pull_request) Failing after 1m9s
Details
2025-10-02 01:36:30 +02:00 Compare
octocar changed title from WIP: [common] port to SDL3 to [common] port to SDL3 2025-10-02 13:08:35 +02:00
octocar commented 2025-10-02 13:26:34 +02:00
Author
First-time contributor
Copy link

tested:

  • gyro
  • audio
  • cli
  • gamepad
  • keyboard
  • mouse
  • multiple gamepads
tested: - [x] gyro - [x] audio - [x] cli - [x] gamepad - [x] keyboard - [x] mouse - [ ] multiple gamepads
octocar commented 2025-10-02 13:29:08 +02:00
Author
First-time contributor
Copy link

cpmfile.json may need changes

cpmfile.json may need changes
DraVee commented 2025-10-02 13:41:52 +02:00
Member
Copy link

Build CI failed, check #2645

Build CI failed, check [#2645](https://github.com/Eden-CI/Workflow/actions/runs/18188827228)
crueter commented 2025-10-02 14:59:04 +02:00
Owner
Copy link

@DraVee wrote in #2645 (comment):

Build CI failed, check #2645

yeah we just need a bundled sdl3

@DraVee wrote in https://git.eden-emu.dev/eden-emu/eden/pulls/2645#issuecomment-5666: > Build CI failed, check [#2645](https://github.com/Eden-CI/Workflow/actions/runs/18188827228) yeah we just need a bundled sdl3
crueter changed title from [common] port to SDL3 to WIP: [common] port to SDL3 2025-10-08 00:09:02 +02:00
crueter force-pushed sdl3 from 02bd53f0e6
All checks were successful
eden-license / license-header (pull_request) Successful in 24s
Details
to 6c0f4a3472
All checks were successful
eden-license / license-header (pull_request) Successful in 24s
Details
2025-10-08 00:19:21 +02:00 Compare
crueter commented 2025-10-08 00:42:25 +02:00
Owner
Copy link

Confirmed that SDL3 works with Gyro + Gamepad and Keyboard + Mouse on system, external, and bundled SDL3 on Linux. Need windows testing

Confirmed that SDL3 works with Gyro + Gamepad and Keyboard + Mouse on system, external, and bundled SDL3 on Linux. Need windows testing
crueter commented 2025-10-08 02:44:58 +02:00
Owner
Copy link

https://cdn.discordapp.com/attachments/1425279065430167644/1425282292317946017/20251008-0041-07.0469107.mp4?ex=68e70512&is=68e5b392&hm=d6b0709c2db8a5f2878bec4553d344fcdf088a776d35859ad40f71c15086fbba&

On Windows, gyro is only working vertically

https://cdn.discordapp.com/attachments/1425279065430167644/1425282292317946017/20251008-0041-07.0469107.mp4?ex=68e70512&is=68e5b392&hm=d6b0709c2db8a5f2878bec4553d344fcdf088a776d35859ad40f71c15086fbba& On Windows, gyro is only working vertically
MaranBr force-pushed sdl3 from 558922b369
All checks were successful
eden-license / license-header (pull_request) Successful in 29s
Details
to 87f38902f3
All checks were successful
eden-license / license-header (pull_request) Successful in 26s
Details
2025-10-14 03:19:50 +02:00 Compare
crueter commented 2025-10-15 18:58:56 +02:00
Owner
Copy link

idea: only use sdl3 on Linux/macOS

idea: only use sdl3 on Linux/macOS
octocar reviewed 2025-10-15 23:09:09 +02:00
src/input_common/drivers/sdl_driver.cpp Outdated
@ -65,3 +60,3 @@
}
bool UpdateMotion(SDL_ControllerSensorEvent event) {
bool UpdateMotion(SDL_GamepadSensorEvent event) {
octocar commented 2025-10-15 23:09:09 +02:00
Author
First-time contributor
Copy link

We could try fixing the windows issue by changing the axis remapping here?

We could try fixing the windows issue by changing the axis remapping here?
crueter commented 2025-10-16 01:58:39 +02:00
Owner
Copy link

Go for it. I don't know anything about SDL except SDL1 so I've got nothing

Go for it. I don't know anything about SDL except SDL1 so I've got nothing
octocar commented 2025-10-16 09:25:33 +02:00
Author
First-time contributor
Copy link

I don't own a Win machine

I don't own a Win machine
MaranBr force-pushed sdl3 from 87f38902f3
All checks were successful
eden-license / license-header (pull_request) Successful in 26s
Details
to 0a29a81b80
Some checks failed
eden-license / license-header (pull_request) Successful in 32s
Details
build.yml / [cmake] sdl3 ci, fixup cpmfile defs, fix sdl headers (pull_request) Failing after 0s
Details
trigger_release.yml / [cmake] sdl3 ci, fixup cpmfile defs, fix sdl headers (pull_request) Failing after 0s
Details
2025-10-16 21:53:00 +02:00 Compare
DraVee commented 2025-12-27 18:42:38 +01:00
Member
Copy link

Need to be rebased and checked again

Need to be rebased and checked again
crueter commented 2025-12-31 21:52:55 +01:00
Owner
Copy link

This has too many merge conflicts and doesn't work properly. You or anyone else interested should just open up a new PR from scratch and clean up the history a bit.

This has too many merge conflicts and doesn't work properly. You or anyone else interested should just open up a new PR from scratch and clean up the history a bit.
crueter closed this pull request 2025-12-31 21:52:55 +01:00
Some checks failed
eden-license / license-header (pull_request) Successful in 32s
Required
Details
build.yml / [cmake] sdl3 ci, fixup cpmfile defs, fix sdl headers (pull_request) Failing after 0s
Details
trigger_release.yml / [cmake] sdl3 ci, fixup cpmfile defs, fix sdl headers (pull_request) Failing after 0s
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
MrPurple666
MaranBr
Lizzie
CamilleLaVey
Maufeat
crueter
Labels
Clear labels   
android

Specific to android platform

  
audio

   
bug

Something is not working

  
ci

For changes to the ci/building

  
cmake

   
confirmed

Used when testers confirm a bug is reported and it is reproducable.

  
core

For core changes to the emulator

  
desktop

Specific to desktop PCs, handhelds, etc.

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
frontend

Frontend changes

  
fw

Changes related to firmware

  
git

For enhancements or changes regarding git.

  
graphics

   
loader

For changes to any of the loader implementations

  
nv gpu

For use with changes that involve the emulator GPU and any services.

  
ui

   
vulkan

Used on anything Vulkan-related

No labels
android
audio
bug
ci
cmake
confirmed
core
desktop
duplicate
enhancement
frontend
fw
git
graphics
loader
nv gpu
ui
vulkan
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
eden-emu/eden!2645
No description provided.