diff --git a/build.xml b/build.xml index 157951b5b1..53c51042b2 100644 --- a/build.xml +++ b/build.xml @@ -1255,11 +1255,17 @@ + + + + + + @@ -1287,8 +1293,10 @@ + + @@ -1296,14 +1304,7 @@ - - - - - - - - + @@ -1326,11 +1327,17 @@ + + + + + + @@ -1421,6 +1428,8 @@ + + diff --git a/config/build-bindings.xml b/config/build-bindings.xml index b2541aa378..3988e8674f 100644 --- a/config/build-bindings.xml +++ b/config/build-bindings.xml @@ -23,7 +23,12 @@ This script is included in /config/build-definitions.xml. - + + + + + + @@ -41,7 +46,7 @@ This script is included in /config/build-definitions.xml. - + diff --git a/config/build-definitions.xml b/config/build-definitions.xml index 8b71f8ff76..ad4b374ce9 100644 --- a/config/build-definitions.xml +++ b/config/build-definitions.xml @@ -29,8 +29,6 @@ This script is included in /build.xml and /config/update-dependencies.xml. - - + + diff --git a/config/linux/build.xml b/config/linux/build.xml index af00bd0652..4a229316a8 100644 --- a/config/linux/build.xml +++ b/config/linux/build.xml @@ -277,14 +277,13 @@ - - - - - + + + + - + diff --git a/config/macos/build.xml b/config/macos/build.xml index 2ed1cf8ddb..3c1150177b 100644 --- a/config/macos/build.xml +++ b/config/macos/build.xml @@ -38,7 +38,9 @@ - + + + @@ -60,6 +62,7 @@ + @@ -134,6 +137,7 @@ + @@ -237,7 +241,11 @@ - + + + + + diff --git a/modules/lwjgl/meow/src/main/c/meow_intrinsics.h b/modules/lwjgl/meow/src/main/c/meow_intrinsics.h index f9c6ff3596..9f2152c4b3 100644 --- a/modules/lwjgl/meow/src/main/c/meow_intrinsics.h +++ b/modules/lwjgl/meow/src/main/c/meow_intrinsics.h @@ -150,9 +150,15 @@ typedef struct { static int MeowHashesAreEqualImpl(meow_u128 A, meow_u128 B) { + #ifdef LWJGL_WINDOWS + uint8x16_t Powers = {.n128_u8={ + 1, 2, 4, 8, 16, 32, 64, 128, 1, 2, 4, 8, 16, 32, 64, 128, + }}; + #else uint8x16_t Powers = { 1, 2, 4, 8, 16, 32, 64, 128, 1, 2, 4, 8, 16, 32, 64, 128, }; + #endif uint8x16_t Input = vceqq_u8(A, B); uint64x2_t Mask = vpaddlq_u32(vpaddlq_u16(vpaddlq_u8(vandq_u8(Input, Powers)))); diff --git a/modules/lwjgl/opencl/src/test/java/org/lwjgl/opencl/CLTest.java b/modules/lwjgl/opencl/src/test/java/org/lwjgl/opencl/CLTest.java index a5f0faa93e..e620af315e 100644 --- a/modules/lwjgl/opencl/src/test/java/org/lwjgl/opencl/CLTest.java +++ b/modules/lwjgl/opencl/src/test/java/org/lwjgl/opencl/CLTest.java @@ -30,6 +30,12 @@ public class CLTest { private void createCL() { try { CL.getFunctionProvider(); + + try (MemoryStack stack = stackPush()) { + IntBuffer pi = stack.mallocInt(1); + checkCLError(clGetPlatformIDs(null, pi)); + } + CL.destroy(); } catch (Throwable t) { throw new SkipException("Skipped because OpenCL initialization failed [" + t.getMessage() + "]");