Merge remote-tracking branch 'eduke32/master'

nukeykt · Dec 17, 2024 · 15af7d8 · 15af7d8
2 parents c09c32e + d384b22
commit 15af7d8
Show file tree

Hide file tree

Showing 54 changed files with 2,161 additions and 852 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -130,6 +130,7 @@ mimalloc_obj := $(obj)/$(mimalloc)
 
 mimalloc_excl := \
     alloc-override.c \
+    arena-abandon.c \
     free.c \
     page-queue.c \
     static.c \

diff --git a/package/common/gamecontrollerdb.txt b/package/common/gamecontrollerdb.txt
diff --git a/platform/Windows/build.vcxproj b/platform/Windows/build.vcxproj
@@ -439,6 +439,7 @@
     <ClInclude Include="..\..\source\build\include\winlayer.h" />
     <ClInclude Include="..\..\source\build\include\xxh3.h" />
     <ClInclude Include="..\..\source\build\include\xxhash.h" />
+    <ClInclude Include="..\..\source\build\include\xxhash_config.h" />
     <ClInclude Include="..\..\source\build\src\engine_priv.h" />
   </ItemGroup>
   <ItemGroup>

diff --git a/platform/Windows/build.vcxproj.filters b/platform/Windows/build.vcxproj.filters
@@ -505,6 +505,9 @@
     <ClInclude Include="..\..\source\build\include\log.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\build\include\xxhash_config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\source\build\src\polymost1Frag.glsl">

diff --git a/platform/Windows/include/SDL2/SDL_audio.h b/platform/Windows/include/SDL2/SDL_audio.h
@@ -594,7 +594,7 @@ extern DECLSPEC int SDLCALL SDL_GetDefaultAudioInfo(char **name,
  *   frames_ (with stereo output, two samples--left and right--would make a
  *   single sample frame). This number should be a power of two, and may be
  *   adjusted by the audio driver to a value more suitable for the hardware.
- *   Good values seem to range between 512 and 8096 inclusive, depending on
+ *   Good values seem to range between 512 and 4096 inclusive, depending on
  *   the application and CPU speed. Smaller values reduce latency, but can
  *   lead to underflow if the application is doing heavy processing and cannot
  *   fill the audio buffer in time. Note that the number of sample frames is

diff --git a/platform/Windows/include/SDL2/SDL_cpuinfo.h b/platform/Windows/include/SDL2/SDL_cpuinfo.h
@@ -53,9 +53,11 @@ _m_prefetch(void *__P)
 #ifndef __MMX__
 #define __MMX__
 #endif
+/*
 #ifndef __3dNOW__
 #define __3dNOW__
 #endif
+*/
 #endif
 #ifndef __SSE__
 #define __SSE__

diff --git a/platform/Windows/include/SDL2/SDL_hints.h b/platform/Windows/include/SDL2/SDL_hints.h
@@ -1424,7 +1424,19 @@ extern "C" {
 #define SDL_HINT_MOUSE_RELATIVE_WARP_MOTION  "SDL_MOUSE_RELATIVE_WARP_MOTION"
 
 /**
- *  \brief  A variable controlling whether mouse events should generate synthetic touch events
+ *  \brief  A variable controlling whether the hardware cursor stays visible when relative mode is active.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - The cursor will be hidden while relative mode is active (default)
+ *    "1"       - The cursor will remain visible while relative mode is active
+ *
+ *  Note that for systems without raw hardware inputs, relative mode is implemented using warping, so the hardware cursor will visibly warp between frames if this is enabled on those systems.
+ */
+#define SDL_HINT_MOUSE_RELATIVE_CURSOR_VISIBLE  "SDL_MOUSE_RELATIVE_CURSOR_VISIBLE"
+
+/**
+ * A variable controlling whether mouse events should generate synthetic touch
+ * events
  *
  *  This variable can be set to the following values:
  *    "0"       - Mouse events will not generate touch events (default for desktop platforms)
@@ -1900,6 +1912,7 @@ extern "C" {
  * Since it's driver-specific, it's only supported where possible and
  * implemented. Currently supported the following drivers:
  *
+ * - Wayland (wayland)
  * - KMSDRM (kmsdrm)
  * - Raspberry Pi (raspberrypi)
  */

diff --git a/platform/Windows/include/SDL2/SDL_joystick.h b/platform/Windows/include/SDL2/SDL_joystick.h
@@ -790,12 +790,17 @@ extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
  * **WARNING**: Calling this function may delete all events currently in SDL's
  * event queue.
  *
- * \param state can be one of `SDL_QUERY`, `SDL_IGNORE`, or `SDL_ENABLE`
- * \returns 1 if enabled, 0 if disabled, or a negative error code on failure;
- *          call SDL_GetError() for more information.
+ * While `param` is meant to be one of `SDL_QUERY`, `SDL_IGNORE`, or
+ * `SDL_ENABLE`, this function accepts any value, with any non-zero value that
+ * isn't `SDL_QUERY` being treated as `SDL_ENABLE`.
  *
- *          If `state` is `SDL_QUERY` then the current state is returned,
- *          otherwise the new processing state is returned.
+ * If SDL was built with events disabled (extremely uncommon!), this will
+ * do nothing and always return `SDL_IGNORE`.
+ *
+ * \param state can be one of `SDL_QUERY`, `SDL_IGNORE`, or `SDL_ENABLE`
+ * \returns If `state` is `SDL_QUERY` then the current state is returned,
+ *          otherwise `state` is returned (even if it was not one of the
+ *          allowed values).
  *
  * \since This function is available since SDL 2.0.0.
  *

diff --git a/platform/Windows/include/SDL2/SDL_stdinc.h b/platform/Windows/include/SDL2/SDL_stdinc.h
@@ -255,9 +255,9 @@ typedef uint64_t Uint64;
 #ifndef SDL_PRIs64
 #if defined(__WIN32__) || defined(__GDK__)
 #define SDL_PRIs64 "I64d"
-#elif defined(PRIs64)
-#define SDL_PRIs64 PRIs64
-#elif defined(__LP64__) && !defined(__APPLE__)
+#elif defined(PRId64)
+#define SDL_PRIs64 PRId64
+#elif defined(__LP64__) && !defined(__APPLE__) && !defined(__EMSCRIPTEN__)
 #define SDL_PRIs64 "ld"
 #else
 #define SDL_PRIs64 "lld"
@@ -377,9 +377,12 @@ typedef uint64_t Uint64;
 
 #ifndef SDL_COMPILE_TIME_ASSERT
 #if defined(__cplusplus)
+/* Keep C++ case alone: Some versions of gcc will define __STDC_VERSION__ even when compiling in C++ mode. */
 #if (__cplusplus >= 201103L)
 #define SDL_COMPILE_TIME_ASSERT(name, x)  static_assert(x, #x)
 #endif
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202311L)
+#define SDL_COMPILE_TIME_ASSERT(name, x)  static_assert(x, #x)
 #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
 #define SDL_COMPILE_TIME_ASSERT(name, x) _Static_assert(x, #x)
 #endif

diff --git a/platform/Windows/include/SDL2/SDL_version.h b/platform/Windows/include/SDL2/SDL_version.h
@@ -59,7 +59,7 @@ typedef struct SDL_version
 */
 #define SDL_MAJOR_VERSION   2
 #define SDL_MINOR_VERSION   30
-#define SDL_PATCHLEVEL      4
+#define SDL_PATCHLEVEL      10
 
 /**
  * Macro to determine SDL version program was compiled against.

diff --git a/platform/Windows/include/SDL2/SDL_vulkan.h b/platform/Windows/include/SDL2/SDL_vulkan.h
@@ -52,6 +52,10 @@ extern "C" {
 VK_DEFINE_HANDLE(VkInstance)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR)
 
+/* Make sure to undef to avoid issues in case of later vulkan include */
+#undef VK_DEFINE_HANDLE
+#undef VK_DEFINE_NON_DISPATCHABLE_HANDLE
+
 #endif /* !NO_SDL_VULKAN_TYPEDEFS */
 
 typedef VkInstance SDL_vulkanInstance;

diff --git a/platform/Windows/lib/32/libSDL2.a b/platform/Windows/lib/32/libSDL2.a
diff --git a/platform/Windows/lib/32/libSDL2main.a b/platform/Windows/lib/32/libSDL2main.a
diff --git a/platform/Windows/lib/64/libSDL2.a b/platform/Windows/lib/64/libSDL2.a
diff --git a/platform/Windows/lib/64/libSDL2main.a b/platform/Windows/lib/64/libSDL2main.a
diff --git a/platform/Windows/mimalloc.vcxproj b/platform/Windows/mimalloc.vcxproj
@@ -59,7 +59,7 @@
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\source\mimalloc\src\page.c" />
-    <ClCompile Include="..\..\source\mimalloc\src\prim\windows\prim.c" />
+    <ClCompile Include="..\..\source\mimalloc\src\prim\prim.c" />
     <ClCompile Include="..\..\source\mimalloc\src\random.c" />
     <ClCompile Include="..\..\source\mimalloc\src\segment-map.c" />
     <ClCompile Include="..\..\source\mimalloc\src\segment.c" />

diff --git a/platform/Windows/mimalloc.vcxproj.filters b/platform/Windows/mimalloc.vcxproj.filters
@@ -94,11 +94,11 @@
     <ClCompile Include="..\..\source\mimalloc\src\stats.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\mimalloc\src\prim\windows\prim.c">
-      <Filter>Source Files\prim</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\source\mimalloc\src\segment-map.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\source\mimalloc\src\prim\prim.c">
+      <Filter>Source Files\prim</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>