Merge branch 'tomi/wip/rebase_3.4.1' into wip/rebase_3.4.1

Author: alexytomi

.github/workflows/android/settings.gradle

@@ -13,4 +13,4 @@ dependencyResolutionManagement {
         maven { url "https://jitpack.io" }
     }
 }
-rootProject.name = 'lwjgl3-natives'
+rootProject.name = 'lwjgl-3.4.1-natives'

.github/workflows/build-android.yml

@@ -32,13 +32,13 @@ jobs:
       if: ${{matrix.arch == 'arm64'}} # Only upload this once
       uses: actions/upload-artifact@v4
       with:
-        name: lwjgl3-android-modules
+        name: lwjgl-3.4.1-android-modules
         path: bin/RELEASE
 
     - name: Upload native build output
       uses: actions/upload-artifact@v4
       with:
-        name: lwjgl3-android-natives-${{matrix.arch}}
+        name: lwjgl-3.4.1-android-natives-${{matrix.arch}}
         path: bin/out
   aar:
     needs: build
@@ -53,29 +53,29 @@ jobs:
     - name: Download built native artifacts (arm64)
       uses: actions/download-artifact@v8
       with:
-          name: lwjgl3-android-natives-arm64
-          path: .github/workflows/android/jniLibs/arm64-v8a
+          name: lwjgl-3.4.1-android-natives-arm64
+          path: .github/workflows/android/assets/components/lwjgl-3.4.1-natives/arm64-v8a
     - name: Download built native artifacts (arm32)
       uses: actions/download-artifact@v8
       with:
-          name: lwjgl3-android-natives-arm32
-          path: .github/workflows/android/jniLibs/armeabi-v7a
+          name: lwjgl-3.4.1-android-natives-arm32
+          path: .github/workflows/android/assets/components/lwjgl-3.4.1-natives/armeabi-v7a
     - name: Download built native artifacts (x64)
       uses: actions/download-artifact@v8
       with:
-          name: lwjgl3-android-natives-x64
-          path: .github/workflows/android/jniLibs/x86_64
+          name: lwjgl-3.4.1-android-natives-x64
+          path: .github/workflows/android/assets/components/lwjgl-3.4.1-natives/x86_64
     - name: Download built native artifacts (x86)
       uses: actions/download-artifact@v8
       with:
-          name: lwjgl3-android-natives-x86
-          path: .github/workflows/android/jniLibs/x86
+          name: lwjgl-3.4.1-android-natives-x86
+          path: .github/workflows/android/assets/components/lwjgl-3.4.1-natives/x86
     - name: Compile into one AAR
       run: |
           cd $GITHUB_WORKSPACE/.github/workflows/android
           gradle assembleRelease
     - name: Upload AAR
       uses: actions/upload-artifact@v4
       with: 
-          name: lwjgl3-android-natives-aar
-          path: .github/workflows/android/build/outputs/aar/lwjgl3-natives-release.aar
+          name: lwjgl-3.4.1-android-natives-aar
+          path: .github/workflows/android/build/outputs/aar/lwjgl-3.4.1-natives-release.aar

build.xml

@@ -1605,7 +1605,8 @@
 
             <release-module name="core" native-library="lwjgl" title="Core"/>
 
-            <sequential if:set="jdk25">
+            <sequential if:set="dontRunThisBecauseItsNotUsed">
+            <!-- <sequential if:set="jdk25"> -->
                 <!-- Generate module-info override for JDK 25 without the FFM backend -->
                 <java
                         classname="org.lwjgl.system.ffm.FFM"

ci_build_android.bash

@@ -98,7 +98,7 @@ yes | ant -Dplatform.linux=true \
   -Dbinding.harfbuzz=false \
   -Dbinding.hwloc=false \
   -Dbinding.jawt=false \
-  -Dbinding.jemalloc=true \
+  -Dbinding.jemalloc=false \
   -Dbinding.ktx=false \
   -Dbinding.libdivide=false \
   -Dbinding.llvm=false \
@@ -122,15 +122,16 @@ yes | ant -Dplatform.linux=true \
   -Dbinding.sse=false \
   -Dbinding.spng=false \
   -Dbinding.tinyexr=false \
+  -Dbinding.tinyfd=true \
   -Dbinding.tootle=false \
   -Dbinding.xxhash=false \
   -Dbinding.yoga=false \
   -Dbinding.zstd=false \
-  -Dbinding.shaderc=false \
+  -Dbinding.shaderc=true \
   -Dbinding.sdl=false \
-  -Dbinding.vulkan=false \
-  -Dbinding.vma=false \
-  -Dbinding.spvc=false \
+  -Dbinding.vulkan=true \
+  -Dbinding.vma=true \
+  -Dbinding.spvc=true \
   -Dbuild.type=release/3.4.1 \
   -Djavadoc.skip=true \
   -Dnashorn.args="--no-deprecation-warning" \

ci_build_ios.bash

@@ -77,10 +77,14 @@ yes | ant -Dplatform.macos=true \
   -Dbinding.remotery=false \
   -Dbinding.renderdoc=false \
   -Dbinding.rpmalloc=false \
-  -Dbinding.spvc=false \
+  -Dbinding.vulkan=true \
+  -Dbinding.vma=true \
+  -Dbinding.spvc=true \
+  -Dbinding.shaderc=true \
   -Dbinding.sse=false \
   -Dbinding.spng=false \
   -Dbinding.tinyexr=false \
+  -Dbinding.tinyfd=true \
   -Dbinding.tootle=false \
   -Dbinding.xxhash=false \
   -Dbinding.yoga=false \

modules/lwjgl/core/src/main/java/org/lwjgl/system/MemoryUtil.java

@@ -403,14 +403,6 @@ public static void memFree(@Nullable CustomBuffer<?> ptr) {
         }
     }
 
-    // from LWJGL 3.2.2
-    /** {@code PointerBuffer} version of {@link #memFree}. */
-    public static void memFree(@Nullable PointerBuffer ptr) {
-        if (ptr != null) {
-            nmemFree(ptr.address);
-        }
-    }
-
     // --- [ memCalloc ] ---
 
     /** Unsafe version of {@link #memCalloc}. May return {@link #NULL} if {@code num} or {@code size} are zero or the allocation failed. */
@@ -2434,23 +2426,6 @@ public static void memSet(long ptr, int value, long bytes) {
         memset(ptr, value, bytes);
     }
 
-    // Bit from a where mask bit is 0, bit from b where mask bit is 1.
-    private static long merge(long a, long b, long mask) {
-        return a ^ ((a ^ b) & mask);
-    }
-
-    // from LWJGL 3.1.2
-    /**
-     * Sets all bytes in a specified block of memory to a copy of another block.
-     *
-     * @param src   the source memory address
-     * @param dst   the destination memory address
-     * @param bytes the number of bytes to copy
-     */
-    public static void memCopy(long src, long dst, int bytes) {
-        memCopy(src, dst, (long)bytes);
-    }
-
     /**
      * Sets all bytes in a specified block of memory to a copy of another block.
      *