Skip to content

Commit 1fc53b5

Browse files
committed
Update to SDL 2.30.12
Remove broken Windows HDPI support Fix submodule? try to fix CI Add some missing files Update to SDL2 2.30.12 Include khronos headers Enable EGL on macOS Enable GLES on Mac
1 parent 8bfc0be commit 1fc53b5

File tree

4 files changed

+25
-6
lines changed

4 files changed

+25
-6
lines changed

Diff for: project/lib/custom/sdl/include/SDL_config_macosx.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
#define SDL_VIDEO_OPENGL_ES2 1
212212
#endif
213213
#ifndef SDL_VIDEO_OPENGL_EGL
214-
#define SDL_VIDEO_OPENGL_EGL 0
214+
#define SDL_VIDEO_OPENGL_EGL 1
215215
#endif
216216
#ifndef SDL_VIDEO_OPENGL_CGL
217217
#define SDL_VIDEO_OPENGL_CGL 1

Diff for: project/lib/sdl

Submodule sdl updated 1402 files

Diff for: project/lib/sdl-files.xml

+22-3
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/sdl/include/" />
100100
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/" />
101101
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/hidapi/" />
102+
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/src/video/khronos/" />
102103
<compilerflag value="-I${SDL_CONFIG_PATH}" if="SDL_CONFIG_PATH" />
103104

104105
<compilerflag value="-DGL_GLEXT_PROTOTYPES" if="android || rpi" />
@@ -127,6 +128,7 @@
127128

128129
<section if="linux">
129130

131+
<compilerflag value="-DHAVE_LINUX_INPUT_H" />
130132
<compilerflag value="-DHAVE_LINUX_VERSION_H" />
131133
<compilerflag value="-D_REENTRANT" />
132134
<compilerflag value="-mmmx" unless="rpi" />
@@ -196,12 +198,16 @@
196198
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_quit.c" />
197199
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_touch.c" />
198200
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_windowevents.c" />
201+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_scancode_tables.c" />
202+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_keysym_to_scancode.c" />
199203
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/file/SDL_rwops.c" />
200204
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/SDL_haptic.c" />
201205
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/SDL_hidapi.c" />
206+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/controller_type.c" />
207+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/steam/SDL_steamcontroller.c" />
202208
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/SDL_gamecontroller.c" />
203209
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/SDL_joystick.c" />
204-
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/steam/SDL_steamcontroller.c" />
210+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/SDL_steam_virtual_gamepad.c" />
205211
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/virtual/SDL_virtualjoystick.c" />
206212
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/e_atan2.c" />
207213
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/e_exp.c" />
@@ -245,9 +251,12 @@
245251
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_hints.c" />
246252
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_list.c" />
247253
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_log.c" />
254+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_utils.c" />
255+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_guid.c" />
248256
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL.c" />
249257
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/sensor/dummy/SDL_dummysensor.c" />
250258
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/sensor/SDL_sensor.c" />
259+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_crc16.c" />
251260
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_crc32.c" />
252261
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_getenv.c" />
253262
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_iconv.c" />
@@ -281,7 +290,9 @@
281290
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_video.c" />
282291
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_vulkan_utils.c" />
283292
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_yuv.c" />
284-
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb.c" />
293+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb_std.c" />
294+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb_sse.c" />
295+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb_lsx.c" />
285296

286297
<section unless="windows">
287298

@@ -294,7 +305,7 @@
294305

295306
</section>
296307

297-
<section if="android || ios || windows || rpi || tvos">
308+
<section if="android || ios || windows || rpi || tvos || mac">
298309

299310
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengles/SDL_render_gles.c" />
300311
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengles2/SDL_render_gles2.c" />
@@ -307,6 +318,7 @@
307318

308319
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_gamecube.c" />
309320
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_luna.c" />
321+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_ps3.c" />
310322
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_ps4.c" />
311323
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_ps5.c" />
312324
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_rumble.c" />
@@ -316,6 +328,10 @@
316328
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_xbox360.c" />
317329
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_xbox360w.c" />
318330
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_xboxone.c" />
331+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_shield.c" />
332+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_combined.c" />
333+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_wii.c" />
334+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_steamdeck.c" />
319335
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapijoystick.c" />
320336

321337
</section>
@@ -455,6 +471,7 @@
455471
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/winmm/SDL_winmm.c" />
456472
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/windows/SDL_windows.c" />
457473
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/windows/SDL_xinput.c" />
474+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/windows/SDL_immdevice.c" />
458475
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/windows/SDL_dinputhaptic.c" />
459476
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/windows/SDL_windowshaptic.c" />
460477
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/windows/SDL_xinputhaptic.c" />
@@ -464,6 +481,7 @@
464481
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/windows/SDL_xinputjoystick.c" />
465482
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/loadso/windows/SDL_sysloadso.c" />
466483
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_render_d3d11.c" />
484+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d12/SDL_render_d3d12.c" />
467485
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/SDL_d3dmath.c" />
468486
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/thread/generic/SDL_syscond.c" />
469487
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/thread/windows/SDL_sysmutex.c" />
@@ -509,6 +527,7 @@
509527
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/misc/winrt/SDL_sysurl.cpp" />
510528
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/power/winrt/SDL_syspower.cpp" />
511529
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_render_d3d11.c" />
530+
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d12/SDL_render_d3d12.c" />
512531
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_render_winrt.cpp" />
513532
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_shaders_d3d11.c" />
514533
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/winrt/SDL_winrtevents.cpp" />

Diff for: project/src/graphics/opengl/OpenGL.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
#include <gl/GL.h>
8080
#endif
8181

82-
typedef ptrdiff_t GLsizeiptrARB;
82+
// typedef ptrdiff_t GLsizeiptrARB;
8383
#define NEED_EXTENSIONS
8484
#define DYNAMIC_OGL
8585

0 commit comments

Comments
 (0)