feat(cuda) update to 12.5.1

LWJGL · Jul 13, 2024 · f5e87be · f5e87be
1 parent 82b0db6
commit f5e87be
Show file tree

Hide file tree

Showing 28 changed files with 12,555 additions and 4,822 deletions.
diff --git a/doc/notes/3.3.4.md b/doc/notes/3.3.4.md
@@ -10,6 +10,7 @@ This build includes the following changes:
 - Assimp: Updated to 5.4.2 (up from 5.2.5)
 - bgfx: Updated to API version 128 (up from 122)
   * Windows: support for the Direct3D 9 backend has been dropped.
+- CUDA: Updated to 12.5.1 (up from 12.1.0)
 - FMOD: Updated to 2.02.21 (up from 2.02.16)
 - glfw: Updated to 3.4 (up from 3.3.8)
   * Added `GLFW_UNLIMITED_MOUSE_BUTTONS`, `GLFW_SCALE_FRAMEBUFFER`, `GLFW_WIN32_SHOWDEFAULT`.

diff --git a/modules/generator/src/main/kotlin/org/lwjgl/generator/Functions.kt b/modules/generator/src/main/kotlin/org/lwjgl/generator/Functions.kt
@@ -835,8 +835,9 @@ class Func(
             println("""$t${t}MemoryStack stack = stackGet(); int stackPointer = stack.getPointer();
         try {
             ${if (hasReturnStatement) { """long __result = stack.n${when {
-                    returns.nativeType.mapping == PrimitiveMapping.BOOLEAN -> "byte"
                     returns.nativeType is PointerType<*>                   -> "pointer"
+                    returns.nativeType.mapping == PrimitiveMapping.POINTER -> "pointer"
+                    returns.nativeType.mapping == PrimitiveMapping.BOOLEAN -> "byte"
                     else                                                   -> returns.nativeType.nativeMethodType
                 }}(${when (returns.nativeType.mapping) {
                     PrimitiveMapping.BOOLEAN,
@@ -858,8 +859,9 @@ class Func(
                             it.name
                         } else {
                             "stack.n${when {
-                                it.nativeType.mapping == PrimitiveMapping.BOOLEAN -> "byte"
                                 it.nativeType is PointerType<*>                   -> "pointer"
+                                it.nativeType.mapping == PrimitiveMapping.POINTER -> "pointer"
+                                it.nativeType.mapping == PrimitiveMapping.BOOLEAN -> "byte"
                                 else                                              -> it.nativeType.nativeMethodType
                             }}(${it.name})"
                         }

diff --git a/modules/generator/src/main/kotlin/org/lwjgl/generator/Types.kt b/modules/generator/src/main/kotlin/org/lwjgl/generator/Types.kt
@@ -146,12 +146,13 @@ open class IntegerType(name: String, mapping: PrimitiveMapping, val unsigned: Bo
     override val const by lazy { IntegerType(this.name.const, this.mapping, unsigned) }
     override val libffiType: String
         get() = when (mapping) {
-            PrimitiveMapping.BYTE  -> if (unsigned) "ffi_type_uint8" else "ffi_type_sint8"
-            PrimitiveMapping.SHORT -> if (unsigned) "ffi_type_uint16" else "ffi_type_sint16"
-            PrimitiveMapping.INT   -> if (unsigned) "ffi_type_uint32" else "ffi_type_sint32"
-            PrimitiveMapping.LONG  -> if (unsigned) "ffi_type_uint64" else "ffi_type_sint64"
-            PrimitiveMapping.CLONG -> if (unsigned) "ffi_type_ulong" else "ffi_type_slong"
-            else                   -> throw IllegalStateException(this.toString())
+            PrimitiveMapping.BYTE    -> if (unsigned) "ffi_type_uint8" else "ffi_type_sint8"
+            PrimitiveMapping.SHORT   -> if (unsigned) "ffi_type_uint16" else "ffi_type_sint16"
+            PrimitiveMapping.INT     -> if (unsigned) "ffi_type_uint32" else "ffi_type_sint32"
+            PrimitiveMapping.LONG    -> if (unsigned) "ffi_type_uint64" else "ffi_type_sint64"
+            PrimitiveMapping.CLONG   -> if (unsigned) "ffi_type_ulong" else "ffi_type_slong"
+            PrimitiveMapping.POINTER -> "ffi_type_pointer"
+            else                     -> throw IllegalStateException(this.toString())
         }
     override val abiType: String
         get() = when (mapping) {

diff --git a/modules/lwjgl/core/src/generated/c/org_lwjgl_system_JNI.c b/modules/lwjgl/core/src/generated/c/org_lwjgl_system_JNI.c
@@ -2783,6 +2783,10 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_system_JNI_callPPPPI__JJJIJIJ(JNIEnv *__en
     UNUSED_PARAMS(__env, clazz)
     return ((jint (APIENTRY *) (uintptr_t, uintptr_t, uintptr_t, jint, uintptr_t, jint))(uintptr_t)__functionAddress)((uintptr_t)param0, (uintptr_t)param1, (uintptr_t)param2, param3, (uintptr_t)param4, param5);
 }
+JNIEXPORT jint JNICALL Java_org_lwjgl_system_JNI_callPPPPI__JJJJIIJ(JNIEnv *__env, jclass clazz, jlong param0, jlong param1, jlong param2, jlong param3, jint param4, jint param5, jlong __functionAddress) {
+    UNUSED_PARAMS(__env, clazz)
+    return ((jint (APIENTRY *) (uintptr_t, uintptr_t, uintptr_t, uintptr_t, jint, jint))(uintptr_t)__functionAddress)((uintptr_t)param0, (uintptr_t)param1, (uintptr_t)param2, (uintptr_t)param3, param4, param5);
+}
 JNIEXPORT jint JNICALL Java_org_lwjgl_system_JNI_callPJPPI__JJIIIJJJ(JNIEnv *__env, jclass clazz, jlong param0, jlong param1, jint param2, jint param3, jint param4, jlong param5, jlong param6, jlong __functionAddress) {
     UNUSED_PARAMS(__env, clazz)
     return ((jint (APIENTRY *) (uintptr_t, jlong, jint, jint, jint, uintptr_t, uintptr_t))(uintptr_t)__functionAddress)((uintptr_t)param0, param1, param2, param3, param4, (uintptr_t)param5, (uintptr_t)param6);
@@ -2983,6 +2987,10 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_system_JNI_callPPPPPPI__JIIJJJJJIIIIJ(JNIE
     UNUSED_PARAMS(__env, clazz)
     return ((jint (APIENTRY *) (uintptr_t, jint, jint, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, jint, jint, jint, jint))(uintptr_t)__functionAddress)((uintptr_t)param0, param1, param2, (uintptr_t)param3, (uintptr_t)param4, (uintptr_t)param5, (uintptr_t)param6, (uintptr_t)param7, param8, param9, param10, param11);
 }
+JNIEXPORT jint JNICALL Java_org_lwjgl_system_JNI_callPPPPPPPI__JJJJJJJJ(JNIEnv *__env, jclass clazz, jlong param0, jlong param1, jlong param2, jlong param3, jlong param4, jlong param5, jlong param6, jlong __functionAddress) {
+    UNUSED_PARAMS(__env, clazz)
+    return ((jint (APIENTRY *) (uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t))(uintptr_t)__functionAddress)((uintptr_t)param0, (uintptr_t)param1, (uintptr_t)param2, (uintptr_t)param3, (uintptr_t)param4, (uintptr_t)param5, (uintptr_t)param6);
+}
 JNIEXPORT jint JNICALL Java_org_lwjgl_system_JNI_callPPPPPPPI__JJIJJJJJJ(JNIEnv *__env, jclass clazz, jlong param0, jlong param1, jint param2, jlong param3, jlong param4, jlong param5, jlong param6, jlong param7, jlong __functionAddress) {
     UNUSED_PARAMS(__env, clazz)
     return ((jint (APIENTRY *) (uintptr_t, uintptr_t, jint, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t))(uintptr_t)__functionAddress)((uintptr_t)param0, (uintptr_t)param1, param2, (uintptr_t)param3, (uintptr_t)param4, (uintptr_t)param5, (uintptr_t)param6, (uintptr_t)param7);

diff --git a/modules/lwjgl/core/src/generated/java/org/lwjgl/system/JNI.java b/modules/lwjgl/core/src/generated/java/org/lwjgl/system/JNI.java
@@ -733,6 +733,7 @@ private JNI() {}
     public static native int callPPPPI(long param0, long param1, int param2, long param3, int param4, long param5, long __functionAddress);
     public static native int callPPPPI(long param0, long param1, long param2, int param3, int param4, long param5, long __functionAddress);
     public static native int callPPPPI(long param0, long param1, long param2, int param3, long param4, int param5, long __functionAddress);
+    public static native int callPPPPI(long param0, long param1, long param2, long param3, int param4, int param5, long __functionAddress);
     public static native int callPJPPI(long param0, long param1, int param2, int param3, int param4, long param5, long param6, long __functionAddress);
     public static native int callPPPPI(long param0, int param1, int param2, int param3, long param4, long param5, long param6, long __functionAddress);
     public static native int callPPPPI(long param0, int param1, long param2, int param3, int param4, long param5, long param6, long __functionAddress);
@@ -783,6 +784,7 @@ private JNI() {}
     public static native int callPPPPPPI(long param0, int param1, long param2, long param3, long param4, int param5, long param6, long param7, long __functionAddress);
     public static native int callPPPPPPI(long param0, long param1, long param2, long param3, int param4, long param5, long param6, int param7, long __functionAddress);
     public static native int callPPPPPPI(long param0, int param1, int param2, long param3, long param4, long param5, long param6, long param7, int param8, int param9, int param10, int param11, long __functionAddress);
+    public static native int callPPPPPPPI(long param0, long param1, long param2, long param3, long param4, long param5, long param6, long __functionAddress);
     public static native int callPPPPPPPI(long param0, long param1, int param2, long param3, long param4, long param5, long param6, long param7, long __functionAddress);
     public static native int callPPPPPPPI(long param0, long param1, long param2, long param3, int param4, long param5, long param6, long param7, long __functionAddress);
     public static native int callPPPPPPPI(long param0, long param1, long param2, long param3, long param4, int param5, long param6, long param7, long __functionAddress);