ref: edb61e26be52bda77fee50071b96ab49675acec6
parent: b859dd5bbe22356ebbd152e4b9c166024ba4df7d
author: Olav Sørensen <olav.sorensen@live.no>
date: Sun Oct 1 14:43:52 EDT 2023
Windows/macOS: Updated SDL to v2.28.3
--- a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h
+++ b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h
@@ -55,6 +55,8 @@
#define SDL_TriggerBreakpoint() __builtin_debugtrap()
#elif ( (!defined(__NACL__)) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))) )
#define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" )
+#elif (defined(__GNUC__) || defined(__clang__)) && defined(__riscv)
+ #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "ebreak\n\t" )
#elif ( defined(__APPLE__) && (defined(__arm64__) || defined(__aarch64__)) ) /* this might work on other ARM targets, but this is a known quantity... */
#define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "brk #22\n\t" )
#elif defined(__APPLE__) && defined(__arm__)
--- a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h
+++ b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h
@@ -240,7 +240,7 @@
/* "REP NOP" is PAUSE, coded for tools that don't know it by that name. */
#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))
#define SDL_CPUPauseInstruction() __asm__ __volatile__("pause\n") /* Some assemblers can't do REP NOP, so go with PAUSE. */-#elif (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__)
+#elif (defined(__arm__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7) || defined(__aarch64__)
#define SDL_CPUPauseInstruction() __asm__ __volatile__("yield" ::: "memory")#elif (defined(__powerpc__) || defined(__powerpc64__))
#define SDL_CPUPauseInstruction() __asm__ __volatile__("or 27,27,27");--- a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h
+++ b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h
@@ -1008,6 +1008,15 @@
#define SDL_HINT_JOYSTICK_THREAD "SDL_JOYSTICK_THREAD"
/**
+ * \brief A variable controlling whether Windows.Gaming.Input should be used for controller handling.
+ *
+ * This variable can be set to the following values:
+ * "0" - WGI is not used
+ * "1" - WGI is used (the default)
+ */
+#define SDL_HINT_JOYSTICK_WGI "SDL_JOYSTICK_WGI"
+
+/**
* \brief Determines whether SDL enforces that DRM master is required in order
* to initialize the KMSDRM video backend.
*
@@ -1464,6 +1473,17 @@
* By default SDL does not sync screen surface updates with vertical refresh.
*/
#define SDL_HINT_RENDER_VSYNC "SDL_RENDER_VSYNC"
+
+/**
+ * \brief A variable controlling whether the Metal render driver select low power device over default one
+ *
+ * This variable can be set to the following values:
+ * "0" - Use the prefered OS device
+ * "1" - Select a low power one
+ *
+ * By default the prefered OS device is used.
+ */
+#define SDL_HINT_RENDER_METAL_PREFER_LOW_POWER_DEVICE "SDL_RENDER_METAL_PREFER_LOW_POWER_DEVICE"
/**
* \brief A variable controlling if VSYNC is automatically disable if doesn't reach the enough FPS
--- a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h
+++ b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h
@@ -1890,7 +1890,7 @@
* Note that as of SDL 2.0.18, this will return NULL if Metal refuses to give
* SDL a drawable to render to, which might happen if the window is
* hidden/minimized/offscreen. This doesn't apply to command encoders for
- * render targets, just the window's backbacker. Check your return values!
+ * render targets, just the window's backbuffer. Check your return values!
*
* \param renderer The renderer to query
* \returns an `id<MTLRenderCommandEncoder>` on success, or NULL if the
--- a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h
+++ b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h
@@ -1,7 +1,7 @@
/* Generated by updaterev.sh, do not edit */
#ifdef SDL_VENDOR_INFO
-#define SDL_REVISION "SDL-release-2.28.0-0-gffa78e6be (" SDL_VENDOR_INFO ")"+#define SDL_REVISION "SDL-release-2.28.3-0-g8a5ba43d0 (" SDL_VENDOR_INFO ")"#else
-#define SDL_REVISION "SDL-release-2.28.0-0-gffa78e6be"
+#define SDL_REVISION "SDL-release-2.28.3-0-g8a5ba43d0"
#endif
#define SDL_REVISION_NUMBER 0
--- a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h
+++ b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h
@@ -59,7 +59,7 @@
*/
#define SDL_MAJOR_VERSION 2
#define SDL_MINOR_VERSION 28
-#define SDL_PATCHLEVEL 0
+#define SDL_PATCHLEVEL 3
/**
* Macro to determine SDL version program was compiled against.
--- a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist
+++ b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
- <string>22F66</string>
+ <string>22F82</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
@@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
- <string>2.28.0</string>
+ <string>2.28.3</string>
<key>CFBundleSignature</key>
<string>SDLX</string>
<key>CFBundleSupportedPlatforms</key>
@@ -27,7 +27,7 @@
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
- <string>2.28.0</string>
+ <string>2.28.3</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
binary files a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/SDL2 b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/SDL2 differ
--- a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources
+++ b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources
@@ -14,7 +14,7 @@
</data>
<key>Resources/Info.plist</key>
<data>
- MP8SsWNX9fsyVRo11YwxKezmPug=
+ O0+yH6th+YqPy5qBlROGAOJkywk=
</data>
<key>Resources/License.txt</key>
<data>
@@ -46,11 +46,11 @@
<dict>
<key>hash</key>
<data>
- bOToHmbN+xx6t5JDrzQswLbnEZM=
+ S50t60okfb3/ykWKavFC3tnkGgE=
</data>
<key>hash2</key>
<data>
- 2yPzeIi/yrrj/kXEyXW4yRLtxPe1iXPO7joeTUBcZaM=
+ uPZQOi25pO/BZWjREOhxmXsoreSNJyZrNOnVJ/TyYzs=
</data>
</dict>
<key>Headers/SDL_atomic.h</key>
@@ -57,11 +57,11 @@
<dict>
<key>hash</key>
<data>
- FTCyRgMQ1IzdGYV2XbCDSQ7JNec=
+ yrv6uC/CjYpeCteZDUbBFr2nwiU=
</data>
<key>hash2</key>
<data>
- 4iFngSAorzMM520V+2V1sriu9mL12sLlPrhNfgT12Ck=
+ Mrfc980NeBAvQ5I040V8xusL6cHBcFfPaA9B2prA4dw=
</data>
</dict>
<key>Headers/SDL_audio.h</key>
@@ -255,11 +255,11 @@
<dict>
<key>hash</key>
<data>
- M/nqf8jyrXJ9IrgLrVffOZG4Jlo=
+ SWTHcoPzInj/HwBHNEFfQGmL6Dw=
</data>
<key>hash2</key>
<data>
- nCUBVEvtWTQ2Ab/H1a9n4I68tT572DhjMnne+N52bwY=
+ BQwW6YWVYXbaOLc9Id+ZjuKHs2VIfcSjM/Oo9JBI6Yk=
</data>
</dict>
<key>Headers/SDL_joystick.h</key>
@@ -552,11 +552,11 @@
<dict>
<key>hash</key>
<data>
- sNcVNpmlpcvsqJmBOwyg6hjTWQ8=
+ 5yyytzTD1eS/K13NSzW6faLAUlA=
</data>
<key>hash2</key>
<data>
- 1EY74HfczRb8zZ3CZfcoinmI8nVMwFaoIfcvG7kPBEE=
+ +ljWDPQHFdheD/Z6QxHzbpNQVg/XVlqx5+B3ovMbIF0=
</data>
</dict>
<key>Headers/SDL_revision.h</key>
@@ -563,11 +563,11 @@
<dict>
<key>hash</key>
<data>
- sRLTPAglYSZ19Pdm+afA2j47taM=
+ ACsjWsXuUQwHVlG5aPLRf54/dIQ=
</data>
<key>hash2</key>
<data>
- Fo7p72CdM/uZzX9nxLeCot/MrKYwSKmo0ESISIMTIOI=
+ FdzvRtvvNjmf4LikKB9CV7MkieGdfgsJbfoN4kxwtqs=
</data>
</dict>
<key>Headers/SDL_rwops.h</key>
@@ -706,11 +706,11 @@
<dict>
<key>hash</key>
<data>
- BrMh/0kZeBHu8Xr+/5hS8IHcMfU=
+ RxJkcIBwFx85nADiCWZgVRs8k7g=
</data>
<key>hash2</key>
<data>
- tIqaCIDNMsT9rQ9arELIo8WVF04pSMBtxaavylyyrK4=
+ 0lwD8QVtsPTM6vhZbDu05D8v6so3iTdjrj3mVjcfhWA=
</data>
</dict>
<key>Headers/SDL_video.h</key>
@@ -783,11 +783,11 @@
<dict>
<key>hash</key>
<data>
- MP8SsWNX9fsyVRo11YwxKezmPug=
+ O0+yH6th+YqPy5qBlROGAOJkywk=
</data>
<key>hash2</key>
<data>
- JS+9bRfZuLgojqjIgCYRqSXUyJ5L/MJO+Cyss5R17Rs=
+ sIWVXC/W1heu51j6IrNeI7fFPvxyVxJPCvMlZ8YpVFA=
</data>
</dict>
<key>Resources/License.txt</key>
binary files a/release/win32/SDL2.dll b/release/win32/SDL2.dll differ
binary files a/release/win64/SDL2.dll b/release/win64/SDL2.dll differ
binary files a/vs2019_project/ft2-clone/SDL2.dll b/vs2019_project/ft2-clone/SDL2.dll differ
--- a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_assert.h
+++ b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_assert.h
@@ -55,6 +55,8 @@
#define SDL_TriggerBreakpoint() __builtin_debugtrap()
#elif ( (!defined(__NACL__)) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))) )
#define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" )
+#elif (defined(__GNUC__) || defined(__clang__)) && defined(__riscv)
+ #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "ebreak\n\t" )
#elif ( defined(__APPLE__) && (defined(__arm64__) || defined(__aarch64__)) ) /* this might work on other ARM targets, but this is a known quantity... */
#define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "brk #22\n\t" )
#elif defined(__APPLE__) && defined(__arm__)
--- a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_atomic.h
+++ b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_atomic.h
@@ -240,7 +240,7 @@
/* "REP NOP" is PAUSE, coded for tools that don't know it by that name. */
#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))
#define SDL_CPUPauseInstruction() __asm__ __volatile__("pause\n") /* Some assemblers can't do REP NOP, so go with PAUSE. */-#elif (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__)
+#elif (defined(__arm__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7) || defined(__aarch64__)
#define SDL_CPUPauseInstruction() __asm__ __volatile__("yield" ::: "memory")#elif (defined(__powerpc__) || defined(__powerpc64__))
#define SDL_CPUPauseInstruction() __asm__ __volatile__("or 27,27,27");--- a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_hints.h
+++ b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_hints.h
@@ -1008,6 +1008,15 @@
#define SDL_HINT_JOYSTICK_THREAD "SDL_JOYSTICK_THREAD"
/**
+ * \brief A variable controlling whether Windows.Gaming.Input should be used for controller handling.
+ *
+ * This variable can be set to the following values:
+ * "0" - WGI is not used
+ * "1" - WGI is used (the default)
+ */
+#define SDL_HINT_JOYSTICK_WGI "SDL_JOYSTICK_WGI"
+
+/**
* \brief Determines whether SDL enforces that DRM master is required in order
* to initialize the KMSDRM video backend.
*
@@ -1464,6 +1473,17 @@
* By default SDL does not sync screen surface updates with vertical refresh.
*/
#define SDL_HINT_RENDER_VSYNC "SDL_RENDER_VSYNC"
+
+/**
+ * \brief A variable controlling whether the Metal render driver select low power device over default one
+ *
+ * This variable can be set to the following values:
+ * "0" - Use the prefered OS device
+ * "1" - Select a low power one
+ *
+ * By default the prefered OS device is used.
+ */
+#define SDL_HINT_RENDER_METAL_PREFER_LOW_POWER_DEVICE "SDL_RENDER_METAL_PREFER_LOW_POWER_DEVICE"
/**
* \brief A variable controlling if VSYNC is automatically disable if doesn't reach the enough FPS
--- a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_render.h
+++ b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_render.h
@@ -1890,7 +1890,7 @@
* Note that as of SDL 2.0.18, this will return NULL if Metal refuses to give
* SDL a drawable to render to, which might happen if the window is
* hidden/minimized/offscreen. This doesn't apply to command encoders for
- * render targets, just the window's backbacker. Check your return values!
+ * render targets, just the window's backbuffer. Check your return values!
*
* \param renderer The renderer to query
* \returns an `id<MTLRenderCommandEncoder>` on success, or NULL if the
--- a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_revision.h
+++ b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_revision.h
@@ -1,7 +1,7 @@
/* Generated by updaterev.sh, do not edit */
#ifdef SDL_VENDOR_INFO
-#define SDL_REVISION "SDL-release-2.28.0-0-gffa78e6be (" SDL_VENDOR_INFO ")"+#define SDL_REVISION "SDL-release-2.28.3-0-g8a5ba43d0 (" SDL_VENDOR_INFO ")"#else
-#define SDL_REVISION "SDL-release-2.28.0-0-gffa78e6be"
+#define SDL_REVISION "SDL-release-2.28.3-0-g8a5ba43d0"
#endif
#define SDL_REVISION_NUMBER 0
--- a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_version.h
+++ b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_version.h
@@ -59,7 +59,7 @@
*/
#define SDL_MAJOR_VERSION 2
#define SDL_MINOR_VERSION 28
-#define SDL_PATCHLEVEL 0
+#define SDL_PATCHLEVEL 3
/**
* Macro to determine SDL version program was compiled against.
binary files a/vs2019_project/x64/Debug/SDL2.dll b/vs2019_project/x64/Debug/SDL2.dll differ