platform: SDL3 backend (desktop + WASM) + two bug repros
- library/modules/platform/sdl3.sx: SdlPlatform impl wrapping SDL3 init,
GL context, event pump, swap. run_frame_loop owns the loop: while loop
on desktop, emscripten_set_main_loop on WASM. Registers an event-watch
that re-invokes the frame closure during macOS modal resize-drag so
content keeps rendering at the new size. safe_insets / keyboard /
show_keyboard / hide_keyboard are no-ops (these targets have no soft
keyboard).
Two compiler bug repros uncovered during the refactor:
- examples/issue-0020.sx: global `Foo = .{}` zero-initializes, ignoring
struct field defaults. Local `Foo = .{}` correctly applies defaults.
Workaround: set fields explicitly in an init method or heap-allocate
the value.
- examples/issue-0021.sx: an enclosing function's return type bleeds
into `xx`'s target type inside an `if-then-else` expression on the
RHS of a struct-field assignment. The same expression in a `-> void`
function produces the right value; in a `-> bool` function it
silently produces 0. Bit the SX Chess game's dpi_scale calc inside
`SdlPlatform.init` (returns bool), making all text labels render
invisibly on retina. Workaround: hoist each `xx` cast into its own
f32 local.
Regression gate: 50/50 examples pass, macOS chess game runs at ~2700fps
(close to the pre-refactor 2900 baseline), WASM build still emits a
working .html/.js/.wasm/.data quad.
This commit is contained in:
agra
224
library/modules/platform/sdl3.sx
Normal file
224
library/modules/platform/sdl3.sx
Normal file
@@ -0,0 +1,224 @@
|
||||
#import "modules/std.sx";
|
||||
#import "modules/allocators.sx";
|
||||
#import "modules/compiler.sx";
|
||||
#import "modules/opengl.sx";
|
||||
#import "modules/sdl3.sx";
|
||||
#import "modules/wasm.sx";
|
||||
#import "modules/ui/types.sx";
|
||||
#import "modules/ui/events.sx";
|
||||
#import "modules/platform/types.sx";
|
||||
#import "modules/platform/api.sx";
|
||||
|
||||
g_sdl_plat : *SdlPlatform = null;
|
||||
|
||||
SdlPlatform :: struct {
|
||||
window: *void = null;
|
||||
gl_ctx: *void = null;
|
||||
running: bool = true;
|
||||
|
||||
width: s32 = 0;
|
||||
height: s32 = 0;
|
||||
pixel_w: s32 = 0;
|
||||
pixel_h: s32 = 0;
|
||||
dpi_scale: f32 = 1.0;
|
||||
|
||||
delta_time: f32 = 0.008;
|
||||
last_perf: u64 = 0;
|
||||
|
||||
frame_closure: Closure() = ---;
|
||||
has_frame_closure: bool = false;
|
||||
|
||||
events: List(Event) = .{};
|
||||
|
||||
stop :: (self: *SdlPlatform) {
|
||||
self.running = false;
|
||||
}
|
||||
}
|
||||
|
||||
impl Platform for SdlPlatform {
|
||||
init :: (self: *SdlPlatform, title: [:0]u8, w: s32, h: s32) -> bool {
|
||||
self.running = true;
|
||||
self.has_frame_closure = false;
|
||||
self.delta_time = 0.008;
|
||||
self.dpi_scale = 1.0;
|
||||
SDL_Init(SDL_INIT_VIDEO);
|
||||
|
||||
inline if OS == {
|
||||
case .wasm: {
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
|
||||
}
|
||||
case .ios: {
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
|
||||
}
|
||||
else: {
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
|
||||
}
|
||||
}
|
||||
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
|
||||
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
|
||||
|
||||
init_w := w;
|
||||
init_h := h;
|
||||
inline if OS == .wasm {
|
||||
init_w = emscripten_run_script_int("window.innerWidth");
|
||||
init_h = emscripten_run_script_int("window.innerHeight");
|
||||
} else {
|
||||
display_id := SDL_GetPrimaryDisplay();
|
||||
bounds : SDL_Rect = ---;
|
||||
if SDL_GetDisplayUsableBounds(display_id, @bounds) {
|
||||
init_w = bounds.w * 3 / 4;
|
||||
init_h = bounds.h * 3 / 4;
|
||||
}
|
||||
}
|
||||
|
||||
self.window = SDL_CreateWindow(title, init_w, init_h,
|
||||
SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY);
|
||||
if self.window == null { return false; }
|
||||
|
||||
self.gl_ctx = SDL_GL_CreateContext(self.window);
|
||||
SDL_GL_MakeCurrent(self.window, self.gl_ctx);
|
||||
SDL_GL_SetSwapInterval(0);
|
||||
|
||||
load_gl(@SDL_GL_GetProcAddress);
|
||||
|
||||
SDL_GetWindowSize(self.window, @self.width, @self.height);
|
||||
SDL_GetWindowSizeInPixels(self.window, @self.pixel_w, @self.pixel_h);
|
||||
wf : f32 = xx self.width;
|
||||
pw : f32 = xx self.pixel_w;
|
||||
self.dpi_scale = if wf > 0.0 then pw / wf else 1.0;
|
||||
|
||||
glViewport(0, 0, self.pixel_w, self.pixel_h);
|
||||
|
||||
g_sdl_plat = self;
|
||||
self.last_perf = SDL_GetPerformanceCounter();
|
||||
true;
|
||||
}
|
||||
|
||||
run_frame_loop :: (self: *SdlPlatform, frame_fn: Closure()) {
|
||||
self.frame_closure = frame_fn;
|
||||
self.has_frame_closure = true;
|
||||
g_sdl_plat = self;
|
||||
|
||||
inline if OS != .wasm {
|
||||
SDL_AddEventWatch(@sdl_event_watch, xx self);
|
||||
}
|
||||
|
||||
inline if OS == .wasm {
|
||||
emscripten_set_main_loop(@sdl_wasm_tick, 0, 1);
|
||||
} else {
|
||||
while self.running {
|
||||
frame_fn();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
poll_events :: (self: *SdlPlatform) -> []Event {
|
||||
self.events.len = 0;
|
||||
sdl_event : SDL_Event = .none;
|
||||
while SDL_PollEvent(@sdl_event) {
|
||||
if sdl_event == {
|
||||
case .quit: { self.running = false; }
|
||||
case .window_resized: (data) {
|
||||
self.width = data.data1;
|
||||
self.height = data.data2;
|
||||
SDL_GetWindowSizeInPixels(self.window, @self.pixel_w, @self.pixel_h);
|
||||
}
|
||||
}
|
||||
ui_event := translate_sdl_event(@sdl_event);
|
||||
if ui_event != .none {
|
||||
self.events.append(ui_event);
|
||||
}
|
||||
}
|
||||
|
||||
result : []Event = ---;
|
||||
result.ptr = self.events.items;
|
||||
result.len = self.events.len;
|
||||
result;
|
||||
}
|
||||
|
||||
begin_frame :: (self: *SdlPlatform) -> FrameContext {
|
||||
current := SDL_GetPerformanceCounter();
|
||||
freq := SDL_GetPerformanceFrequency();
|
||||
if freq > 0 and self.last_perf > 0 {
|
||||
diff : f32 = xx (current - self.last_perf);
|
||||
fr : f32 = xx freq;
|
||||
self.delta_time = diff / fr;
|
||||
}
|
||||
self.last_perf = current;
|
||||
|
||||
inline if OS == .wasm {
|
||||
new_w : s32 = 0;
|
||||
new_h : s32 = 0;
|
||||
SDL_GetWindowSize(self.window, @new_w, @new_h);
|
||||
if new_w != self.width or new_h != self.height {
|
||||
self.width = new_w;
|
||||
self.height = new_h;
|
||||
SDL_GetWindowSizeInPixels(self.window, @self.pixel_w, @self.pixel_h);
|
||||
}
|
||||
}
|
||||
|
||||
FrameContext.{
|
||||
viewport_w = xx self.width,
|
||||
viewport_h = xx self.height,
|
||||
pixel_w = self.pixel_w,
|
||||
pixel_h = self.pixel_h,
|
||||
dpi_scale = self.dpi_scale,
|
||||
delta_time = self.delta_time,
|
||||
};
|
||||
}
|
||||
|
||||
end_frame :: (self: *SdlPlatform) {
|
||||
SDL_GL_SwapWindow(self.window);
|
||||
}
|
||||
|
||||
safe_insets :: (self: *SdlPlatform) -> EdgeInsets {
|
||||
EdgeInsets.zero();
|
||||
}
|
||||
|
||||
keyboard :: (self: *SdlPlatform) -> KeyboardState {
|
||||
KeyboardState.zero();
|
||||
}
|
||||
|
||||
show_keyboard :: (self: *SdlPlatform) { }
|
||||
hide_keyboard :: (self: *SdlPlatform) { }
|
||||
|
||||
shutdown :: (self: *SdlPlatform) {
|
||||
inline if OS != .wasm {
|
||||
SDL_GL_DestroyContext(self.gl_ctx);
|
||||
SDL_DestroyWindow(self.window);
|
||||
SDL_Quit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// SDL fires the watch synchronously when events are added — including during
|
||||
// macOS's modal resize-drag, when SDL_PollEvent can't run. Re-invoking the
|
||||
// frame closure here keeps content rendering at the new size during the drag.
|
||||
sdl_event_watch :: (userdata: *void, event: *SDL_Event) -> bool callconv(.c) {
|
||||
plat : *SdlPlatform = xx userdata;
|
||||
if event.* == {
|
||||
case .window_resized: (data) {
|
||||
plat.width = data.data1;
|
||||
plat.height = data.data2;
|
||||
SDL_GetWindowSizeInPixels(plat.window, @plat.pixel_w, @plat.pixel_h);
|
||||
if plat.has_frame_closure {
|
||||
fn := plat.frame_closure;
|
||||
fn();
|
||||
}
|
||||
}
|
||||
}
|
||||
true;
|
||||
}
|
||||
|
||||
sdl_wasm_tick :: () callconv(.c) {
|
||||
if g_sdl_plat == null { return; }
|
||||
if !g_sdl_plat.has_frame_closure { return; }
|
||||
fn := g_sdl_plat.frame_closure;
|
||||
fn();
|
||||
}
|
||||
Reference in New Issue
Block a user