Skip to content

Commit 6503b92

Browse files
committed
configure: do not prefer SDL2 over SDL3
Unpin SDL version 2 - SDL 3 can be now considered idempotent. Issues mentioned in sdl3: - sdl_mixer -> replaced with fluidsynth - Vulkan issues - Vulkan is currently (SDL 3.20) not implicit in either of platforms; if so, trigger a warning. Also it is unavailable in SDL2. - p010 corruption in Direct3D 11 or 12 - there is already a workaround to disable
1 parent 02cefe8 commit 6503b92

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

configure.ac

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,12 +1321,7 @@ if test "$sdl_req" != no; then
13211321
sdl2_is_compat=yes
13221322
fi
13231323
if test "$sdl_req" = yes || test "$sdl_req" = auto; then
1324-
# temporarily prefer 2 over 3
1325-
sdl_req_ver=231
1326-
# but only if sdl2 is not sdl2_compat
1327-
if test "$sdl2_is_compat"; then
1328-
sdl_req_ver=321
1329-
fi
1324+
sdl_req_ver=321
13301325
fi
13311326

13321327
while test -n "$sdl_req_ver"; do
@@ -1342,9 +1337,6 @@ if test "$sdl_req" != no; then
13421337
sdl_req_ver=$(printf "$sdl_req_ver" | cut -c2-)
13431338
done
13441339

1345-
if test "$sdl_version" = 3 && test ! "$sdl2_is_compat"; then
1346-
UG_MSG_WARN([Using SDL 3, which is experimental. SDL 2 can be enforced with --enable-sdl=2])
1347-
fi
13481340
if test "$sdl_version" = 2 && test "$sdl2_is_compat" ; then
13491341
UG_MSG_WARN([Using SDL3 sdl2_compat, which is not recommended (use 3 directly)])
13501342
fi

src/video_display/sdl3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
* @todo errata (SDL3 vs SDL2)
4646
* 1. [macOS] Vulkan renderer doesn't work (no matter if linked with MoltenVK or
4747
* loader)
48-
* 2. [all platforms] with `renderer=vulkan` - none YCbCr texture works
48+
* 2. [all platforms] with `renderer=vulkan` - none of YCbCr textures work
4949
* (segfaults - wrong pitch/texture?)
5050
* 3. p010 works just on macOS/Metal, crashes on Vulkan (see previous point)
5151
* 4. p010 corrupted on d3d[12] - pixfmts skipped in query*() as a workaround

0 commit comments

Comments
 (0)