WIP sdl3 support

Author: jonof

Makefile

@@ -148,7 +148,7 @@ endif
 
 # Select the system layer
 ifeq ($(RENDERTYPE),SDL)
-	ENGINEOBJS+= $(SRC)/sdlayer2.$o
+	ENGINEOBJS+= $(SRC)/sdlayer$(RENDERTYPEVER).$o
 	OURCFLAGS+= $(SDLCONFIG_CFLAGS)
 	OURLDFLAGS+= $(SDLCONFIG_LIBS)
 

Makefile.shared

@@ -83,11 +83,24 @@ else
 endif
 
 ifeq ($(RENDERTYPE),SDL)
-	ifneq ($(SDL2CONFIG),)
-		SDLCONFIG_CFLAGS=$(shell $(SDL2CONFIG) --cflags)
-		SDLCONFIG_LIBS=$(shell $(SDL2CONFIG) --libs)
+	ifneq (,$(shell $(PKGCONFIG) --exists sdl3 && echo yes))
+		SDLCONFIG_CFLAGS=$(shell $(PKGCONFIG) --cflags sdl3)
+		SDLCONFIG_LIBS=$(shell $(PKGCONFIG) --libs sdl3)
+		RENDERTYPEVER=3
 	else
-		$(error No $(SDL2CONFIG) could be found)
+		ifneq (,$(shell $(PKGCONFIG) --exists sdl2 && echo yes))
+			SDLCONFIG_CFLAGS=$(shell $(PKGCONFIG) --cflags sdl2)
+			SDLCONFIG_LIBS=$(shell $(PKGCONFIG) --libs sdl2)
+			RENDERTYPEVER=2
+		else
+			ifneq ($(SDL2CONFIG),)
+				SDLCONFIG_CFLAGS=$(shell $(SDL2CONFIG) --cflags)
+				SDLCONFIG_LIBS=$(shell $(SDL2CONFIG) --libs)
+				RENDERTYPEVER=2
+			else
+				$(error No SDL2 or SDL3 could be found)
+			endif
+		endif
 	endif
 
 	ifeq (1,$(WITHOUT_GTK))
@@ -106,6 +119,7 @@ ifeq ($(RENDERTYPE),WIN)
 	BUILDLDFLAGS+= -mwindows -ldxguid
 	#BUILDLDFLAGS+= -static
 	#BUILDLDFLAGS+= -static-libgcc -static-libstdc++
+	RENDERTYPEVER=1
 endif
 
 # Until I work out how to deal with PIE and PIC, the x86 inline
@@ -114,7 +128,7 @@ endif
 	USE_ASM=0
 #endif
 
-BUILDCPPFLAGS+= -DRENDERTYPE$(RENDERTYPE)=1
+BUILDCPPFLAGS+= -DRENDERTYPE$(RENDERTYPE)=$(RENDERTYPEVER)
 
 ifneq (0,$(USE_POLYMOST))
   BUILDCPPFLAGS+= -DUSE_POLYMOST=$(USE_POLYMOST)

kenbuild/src/kdmsound_sdl3.c

@@ -0,0 +1,107 @@
+// Ken Silverman's official web site: "http://www.advsys.net/ken"
+// See the included license file "BUILDLIC.TXT" for license info.
+//
+// This file has been modified from Ken Silverman's original release
+// by Jonathon Fowler (jf@jonof.id.au)
+
+#if defined __APPLE__
+# include <SDL3/SDL.h>
+#else
+# include "SDL.h"
+#endif
+
+#define KDMSOUND_INTERNAL
+#include "kdmsound.h"
+
+#if (SDL_MAJOR_VERSION != 3)
+#  error This must be built with SDL3
+#endif
+
+static SDL_AudioStream *dev;
+static int bytespertic;
+
+static void SDLCALL preparesndbuf(void *udata, SDL_AudioStream *stream, int need, int total);
+
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
+
+void initsb(char dadigistat, char damusistat, int dasamplerate, char danumspeakers, char dabytespersample, char daintspersec, char daquality)
+{
+    SDL_AudioSpec want;
+
+    (void)daintspersec; (void)daquality;
+
+    if (dev) return;
+
+    if ((dadigistat == 0) && (damusistat != 1))
+        return;
+
+    SDL_memset(&want, 0, sizeof(want));
+    want.freq = dasamplerate;
+    want.format = dabytespersample == 1 ? SDL_AUDIO_U8 : SDL_AUDIO_S16;
+    want.channels = max(1, min(2, danumspeakers));
+
+    if (!SDL_InitSubSystem(SDL_INIT_AUDIO)) {
+        SDL_Log("Failed to initialise SDL audio subsystem: %s", SDL_GetError());
+        return;
+    }
+
+    dev = SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &want, preparesndbuf, NULL);
+    if (!dev) {
+        SDL_Log("Failed to open audio: %s", SDL_GetError());
+        return;
+    }
+    if (initkdm(dadigistat, damusistat, want.freq, want.channels, SDL_AUDIO_BITSIZE(want.format)>>3)) {
+        SDL_DestroyAudioStream(dev);
+        dev = NULL;
+        SDL_Log("Failed to initialise KDM");
+        return;
+    }
+
+    loadwaves("waves.kwv");
+    bytespertic = (SDL_AUDIO_BITSIZE(want.format)>>3)*want.channels*(((want.freq/120)+1)&~1);
+
+    SDL_ResumeAudioDevice(SDL_GetAudioStreamDevice(dev));
+}
+
+void uninitsb(void)
+{
+    if (dev) SDL_DestroyAudioStream(dev);
+    dev = NULL;
+
+    uninitkdm();
+}
+
+int lockkdm(void)
+{
+    if (!dev) return -1;
+    SDL_LockAudioStream(dev);
+    return 0;
+}
+
+void unlockkdm(void)
+{
+    if (!dev) return;
+    SDL_UnlockAudioStream(dev);
+}
+
+void refreshaudio(void)
+{
+}
+
+void SDLCALL preparesndbuf(void *udata, SDL_AudioStream *stream, int need, int total)
+{
+    Uint8 *sndoffsplc;
+    int sndbufsiz = bytespertic;
+
+    (void)udata; (void)total;
+
+    if (need > 0) {
+        while (sndbufsiz < need) sndbufsiz+=bytespertic;
+        if ((sndoffsplc = SDL_stack_alloc(Uint8, sndbufsiz))) {
+            preparekdmsndbuf(sndoffsplc, sndbufsiz);
+            SDL_PutAudioStreamData(stream, sndoffsplc, sndbufsiz);
+            SDL_stack_free(sndoffsplc);
+        }
+    }
+}