SDL3 port #1756

Jan200101 · 2024-03-27T19:58:37Z

builds against the prerelease

wrap is still being worked on

appears to work from simple testing.

Jan200101 · 2024-04-09T19:04:14Z

re-tested against the 3.1.1 prerelease
works as intended

Jan200101 · 2024-10-05T15:13:50Z

updated to 3.1.3

Jan200101 · 2025-01-24T12:23:39Z

SDL 3.2.0 marks the full release of SDL3 🥳
the PR is ready to merge but lacks any support in the CI (due to SDL3 not being available in most distros) and no wrap

adamharrison · 2025-03-30T15:03:09Z

This looks good. By default, even with --forcefallback, we still get a dynamically linked SDL (likely because my system doesn't have a static one), but I think that's expected, yes, because we don't have a wrap.

The CI builds it and statically links it in correctly.

I think this is good. I'll look into doing a PR based on this in future where we can just stick the static SDL3 build in build.sh or something. I'm willing to stamp this with the official seal. @Guldoman are you good with this?

adamharrison · 2025-03-30T16:21:35Z

Thoughts about adding this as well?

diff --git a/scripts/build.sh b/scripts/build.sh
index 7d73dfdd..fb4c53ea 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -183,6 +183,7 @@ main() {
   elif [[ "$build_dir" == "" ]]; then
     build_dir="$(get_default_build_dir)"
   fi
+  build_dir=$(readlink -f $build_dir)
 
   # arch and platform specific stuff
   if [[ "$platform" == "macos" ]]; then
@@ -214,6 +215,21 @@ main() {
     export PATH="$(dirname "$lpm_path"):$PATH"
   fi
 
+  if [[ "$force_fallback" != "" ]]; then
+    git clone --depth=1 --branch release-3.2.8 https://github.com/libsdl-org/SDL.git $build_dir/SDL3 &&
+      pushd $build_dir/SDL3 && mkdir build && cd build && 
+        cmake .. -DCMAKE_BUILD_TYPE=release \
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DSDL_INSTALL=ON -DSDL_INSTALL_DOCS=OFF -DSDL_DEPS_SHARED=ON \
+        -DSDL_DBUS=ON -DSDL_IBUS=ON -DSDL_AUDIO=OFF -DSDL_GPU=OFF -DSDL_RPATH=OFF -DSDL_PIPEWIRE=OFF \
+        -DSDL_CAMERA=OFF -DSDL_JOYSTICK=OFF -DSDL_HAPTIC=OFF -DSDL_HIDAPI=OFF -DSDL_DIALOG=OFF \
+        -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_VULKAN=OFF -DSDL_LIBUDEV=OFF -DSDL_SHARED=OFF -DSDL_STATIC=ON \
+        -DSDL_X11=ON -DSDL_WAYLAND=ON -DSDL_TESTS=OFF -DSDL_EXAMPLES=OFF -DSDL_VENDOR_INFO=lite-xl \
+        -DCMAKE_INSTALL_PREFIX=$build_dir/prefix && 
+          make -j 8 && make install && popd
+    CFLAGS="-I${build_dir}/prefix/include $CFLAGS"
+    LDFLAGS="-L${build_dir}/prefix/lib $LDFLAGS"
+  fi
+
   CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS meson setup \
     "${build_dir}" \
     --buildtype "$build_type" \

Guldoman · 2025-03-31T16:32:37Z

src/api/renwindow.c

  float width = luaL_optnumber(L, 4, 0);
  float height = luaL_optnumber(L, 5, 0);

  if (width < 1 || height < 1) {
-    SDL_DisplayMode dm;
-    SDL_GetCurrentDisplayMode(0, &dm);
+    const SDL_DisplayMode* dm = SDL_GetCurrentDisplayMode(SDL_GetPrimaryDisplay());


I wonder if we should first create the window then resize it given the display it opened on (SDL_GetDisplayForWindow).

Not really a blocker for this PR, just noting this.

this would not work on Wayland

Mmm, I wonder if there's some leeway given that the resize happens just after we create the window.
Or maybe there's a way to know which monitor is active (aka the window will be created on), and use that.

The main issue (that probably currently happens anyways) is that if the user has wildly different sized monitors, the window might get created too big to fit the screen.

src/api/system.c

Guldoman · 2025-03-31T17:05:23Z

src/renderer.c

    // Seems like SDL doesn't handle clipping as we expect when using
    // scaled blitting, so we "clip" manually.


Might be worth it to check if this got fixed.

The code for this did not change in SDL3 (not for the last 5 years).

I looked at the code and I'm not sure what you meant by "doesn't handle clipping as we expect".
It does seemingly clip the rectangles when the coordinates are off-screen,
and your commit was from 2 years ago.

I am talking about my code. At the time I tried to leave the clipping completely to SDL, but it didn't work as expected. I don't remember what was wrong tho.
This is why I'm hoping SDL3 fixed the issue and we can drop the extra code.

Yes, but looking at the code it seems like the kind of clipping we do explicitly is done by SDL_BlitScaled. The code in thst function had not changed since 5 years ago, so I assume whatever problems with it is not fixed.

However, I didn't observe anything off with the clipping. I also don't know what to look for.

src/renderer.c

src/renwindow.c

the main implementation is now included in a header

This needs to be included to work.

Guldoman

We need to update the docs for the functions that now need a window parameter.

src/api/system.c

Co-authored-by: Guldoman <giulio.lettieri@gmail.com>

src/api/system.c

takase1121 · 2025-04-07T14:24:10Z

Thoughts about adding this as well?

diff --git a/scripts/build.sh b/scripts/build.sh
index 7d73dfdd..fb4c53ea 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -183,6 +183,7 @@ main() {
   elif [[ "$build_dir" == "" ]]; then
     build_dir="$(get_default_build_dir)"
   fi
+  build_dir=$(readlink -f $build_dir)
 
   # arch and platform specific stuff
   if [[ "$platform" == "macos" ]]; then
@@ -214,6 +215,21 @@ main() {
     export PATH="$(dirname "$lpm_path"):$PATH"
   fi
 
+  if [[ "$force_fallback" != "" ]]; then
+    git clone --depth=1 --branch release-3.2.8 https://github.com/libsdl-org/SDL.git $build_dir/SDL3 &&
+      pushd $build_dir/SDL3 && mkdir build && cd build && 
+        cmake .. -DCMAKE_BUILD_TYPE=release \
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DSDL_INSTALL=ON -DSDL_INSTALL_DOCS=OFF -DSDL_DEPS_SHARED=ON \
+        -DSDL_DBUS=ON -DSDL_IBUS=ON -DSDL_AUDIO=OFF -DSDL_GPU=OFF -DSDL_RPATH=OFF -DSDL_PIPEWIRE=OFF \
+        -DSDL_CAMERA=OFF -DSDL_JOYSTICK=OFF -DSDL_HAPTIC=OFF -DSDL_HIDAPI=OFF -DSDL_DIALOG=OFF \
+        -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_VULKAN=OFF -DSDL_LIBUDEV=OFF -DSDL_SHARED=OFF -DSDL_STATIC=ON \
+        -DSDL_X11=ON -DSDL_WAYLAND=ON -DSDL_TESTS=OFF -DSDL_EXAMPLES=OFF -DSDL_VENDOR_INFO=lite-xl \
+        -DCMAKE_INSTALL_PREFIX=$build_dir/prefix && 
+          make -j 8 && make install && popd
+    CFLAGS="-I${build_dir}/prefix/include $CFLAGS"
+    LDFLAGS="-L${build_dir}/prefix/lib $LDFLAGS"
+  fi
+
   CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS meson setup \
     "${build_dir}" \
     --buildtype "$build_type" \

Will do this when I have time in another PR.

src/api/system.c

src/renderer.c

src/api/system.c

adamharrison · 2025-04-07T23:35:49Z

🎉

* update to SDL 3.2.0 * remove SDL wrap * fix darwin and windows CI * update build box, correct msys sdl3 dependency * port leftovers from renderer backend to SDL3 * remove SDL main dep the main implementation is now included in a header * main.c: use SDL_main.h This needs to be included to work. * ci: use vcpkg and pkgconf to support SDL3 on MSVC * ci: use 7z to create zip * renwindow: create texture and surface suitable for the display * system: remove trailing whitespace * renderer: fix trailing whitespace * system: fix checking the wrong argument * system: port rmdir and stat to SDL3 API * system: remove unneeded API level check * system: fix wrong parameter index * system: make set_window_hit_test and set_window_bordered accept a window * docs/system: update docs * system: restore some comments * docs/system: add missing documentation for system.text_input * system: use SDL_setenv_unsafe * system: add back comment for setenv * system,renderer: remove unnecessary SDL_ClearError calls --------- Co-authored-by: takase1121 <20792268+takase1121@users.noreply.github.com> (cherry picked from commit 2716f14)

github-actions bot added Category: Build System Category: C Core labels Mar 27, 2024

Jan200101 force-pushed the PR/sdl3 branch from 6fd606b to 27795fc Compare October 5, 2024 18:24

Jan200101 force-pushed the PR/sdl3 branch from 27795fc to 9b6f8c4 Compare January 24, 2025 12:17

github-actions bot added the Category: Lua Core label Jan 24, 2025

Jan200101 changed the title ~~WIP SDL3 port~~ SDL3 port Jan 24, 2025

Jan200101 marked this pull request as ready for review January 24, 2025 12:23

Jan200101 force-pushed the PR/sdl3 branch from e63b19b to 3cc527d Compare March 16, 2025 21:18

github-actions bot added the Category: CI label Mar 16, 2025

Jan200101 force-pushed the PR/sdl3 branch 2 times, most recently from c641c25 to 56e2c65 Compare March 16, 2025 21:53

Jan200101 force-pushed the PR/sdl3 branch from ef81e1a to 9d8f805 Compare March 27, 2025 09:43

takase1121 force-pushed the PR/sdl3 branch from b5822b8 to 9d8f805 Compare March 30, 2025 03:53

adamharrison approved these changes Mar 30, 2025

View reviewed changes

takase1121 mentioned this pull request Mar 31, 2025

Use SDL3 Callback API #2056

Closed

Guldoman reviewed Mar 31, 2025

View reviewed changes

takase1121 mentioned this pull request Apr 1, 2025

renderer: add offset to renderer when window is borderless and maximized on Windows #1978

Closed

Jan200101 and others added 8 commits April 5, 2025 14:31

update to SDL 3.2.0

f2bdfb3

remove SDL wrap

651f4a2

fix darwin and windows CI

861cb68

update build box, correct msys sdl3 dependency

a59bf04

port leftovers from renderer backend to SDL3

dee751c

remove SDL main dep

c46eb33

the main implementation is now included in a header

main.c: use SDL_main.h

41e9a73

This needs to be included to work.

ci: use vcpkg and pkgconf to support SDL3 on MSVC

959e3ef

takase1121 force-pushed the PR/sdl3 branch from bf37cde to 6885d57 Compare April 5, 2025 06:33

Guldoman reviewed Apr 5, 2025

View reviewed changes

src/api/system.c Show resolved Hide resolved

src/api/system.c Outdated Show resolved Hide resolved

src/api/system.c Outdated Show resolved Hide resolved

takase1121 and others added 7 commits April 6, 2025 09:15

system: fix checking the wrong argument

b1df034

Co-authored-by: Guldoman <giulio.lettieri@gmail.com>

system: port rmdir and stat to SDL3 API

45ce4c2

system: remove unneeded API level check

5ebb592

system: fix wrong parameter index

6e2f41d

system: make set_window_hit_test and set_window_bordered accept a window

45885a2

docs/system: update docs

9ef2ff7

system: restore some comments

d737b3e

github-actions bot added the Category: Documentation label Apr 6, 2025

takase1121 added 2 commits April 6, 2025 10:34

docs/system: add missing documentation for system.text_input

2a6c272

system: use SDL_setenv_unsafe

585bcc7

Jan200101 commented Apr 7, 2025

View reviewed changes

src/api/system.c Show resolved Hide resolved

system: add back comment for setenv

5f1f8f9

takase1121 force-pushed the PR/sdl3 branch from 15c2b21 to 5f1f8f9 Compare April 7, 2025 14:23

Guldoman approved these changes Apr 7, 2025

View reviewed changes

src/api/system.c Show resolved Hide resolved

takase1121 reviewed Apr 7, 2025

View reviewed changes

src/renderer.c Outdated Show resolved Hide resolved

src/renderer.c Outdated Show resolved Hide resolved

src/renderer.c Show resolved Hide resolved

src/api/system.c Outdated Show resolved Hide resolved

system,renderer: remove unnecessary SDL_ClearError calls

df1a0fc

Guldoman approved these changes Apr 7, 2025

View reviewed changes

Guldoman merged commit 2716f14 into lite-xl:master Apr 7, 2025
9 checks passed

takase1121 mentioned this pull request Apr 9, 2025

build.sh: build SDL3 with CMake #2060

Merged

takase1121 added this to Bugfix Release Tracker Apr 18, 2025

github-project-automation bot moved this to PR in Bugfix Release Tracker Apr 18, 2025

takase1121 moved this from PR to Cherry Picked in Bugfix Release Tracker Apr 18, 2025

sefidel mentioned this pull request Jun 10, 2025

lite-xl: 2.1.7 -> 2.1.8 NixOS/nixpkgs#415395

Merged

13 tasks

		// Seems like SDL doesn't handle clipping as we expect when using
		// scaled blitting, so we "clip" manually.

SDL3 port #1756

SDL3 port #1756

Uh oh!

Conversation

Jan200101 commented Mar 27, 2024

Uh oh!

Jan200101 commented Apr 9, 2024

Uh oh!

Jan200101 commented Oct 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Jan200101 commented Jan 24, 2025

Uh oh!

adamharrison commented Mar 30, 2025

Uh oh!

adamharrison commented Mar 30, 2025

Uh oh!

Guldoman Mar 31, 2025

Choose a reason for hiding this comment

Uh oh!

Jan200101 Mar 31, 2025

Choose a reason for hiding this comment

Uh oh!

Guldoman Mar 31, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Guldoman Mar 31, 2025

Choose a reason for hiding this comment

Uh oh!

takase1121 Apr 5, 2025

Choose a reason for hiding this comment

Uh oh!

Guldoman Apr 5, 2025

Choose a reason for hiding this comment

Uh oh!

takase1121 Apr 5, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Guldoman left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

takase1121 commented Apr 7, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adamharrison commented Apr 7, 2025

Uh oh!

Uh oh!

Jan200101 commented Oct 5, 2024 •

edited

Loading