diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f57fe4c67..b0d992d7c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -122,13 +122,14 @@ jobs: - name: Upload onto the Google Play testing track if: github.repository_owner == 'PojavLauncherTeam' && github.ref_name == 'v3_openjdk' - uses: r0adkll/upload-google-play@v1.0.15 + uses: r0adkll/upload-google-play@v1.0.17 with: serviceAccountJsonPlainText: ${{ secrets.GPLAY_SERVICE_JSON }} packageName: net.kdt.pojavlaunch releaseFiles: out/app-gplay.aab track: internal inAppUpdatePriority: 5 + changesNotSentForReview: true - name: Upload APK (without runtime) uses: actions/upload-artifact@v2 diff --git a/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar b/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar index 179e59cbd..aba8d955d 100644 Binary files a/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar and b/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/caciocavallo17/version b/app_pojavlauncher/src/main/assets/components/caciocavallo17/version index 918be360b..d8a65227e 100644 --- a/app_pojavlauncher/src/main/assets/components/caciocavallo17/version +++ b/app_pojavlauncher/src/main/assets/components/caciocavallo17/version @@ -1 +1 @@ -20220819 +20220831 diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libgl4es_114.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libgl4es_114.so index 9b27eb9ea..a629f6463 100755 Binary files a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libgl4es_114.so and b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libgl4es_114.so differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libgl4es_114.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libgl4es_114.so index 65b096a2b..5ea7a8e72 100644 Binary files a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libgl4es_114.so and b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libgl4es_114.so differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86/libgl4es_114.so b/app_pojavlauncher/src/main/jniLibs/x86/libgl4es_114.so index 1517fa5a4..d10e9c3b2 100644 Binary files a/app_pojavlauncher/src/main/jniLibs/x86/libgl4es_114.so and b/app_pojavlauncher/src/main/jniLibs/x86/libgl4es_114.so differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libgl4es_114.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libgl4es_114.so index 2e56611bb..09939b414 100644 Binary files a/app_pojavlauncher/src/main/jniLibs/x86_64/libgl4es_114.so and b/app_pojavlauncher/src/main/jniLibs/x86_64/libgl4es_114.so differ diff --git a/gl4es b/gl4es index b675669fb..0fd67eeac 160000 --- a/gl4es +++ b/gl4es @@ -1 +1 @@ -Subproject commit b675669fbd9acf2592d626fe9dfae929f19b17b2 +Subproject commit 0fd67eeac9ad571f6848ea56ea47e0f0715839fc diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/MemoryUtil.java.z b/jre_lwjgl3glfw/src/main/java/org/lwjgl/MemoryUtil.java similarity index 87% rename from jre_lwjgl3glfw/src/main/java/org/lwjgl/MemoryUtil.java.z rename to jre_lwjgl3glfw/src/main/java/org/lwjgl/MemoryUtil.java index 9dd389abf..d41aa7674 100644 --- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/MemoryUtil.java.z +++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/MemoryUtil.java @@ -46,58 +46,10 @@ public final class MemoryUtil { private static final Charset ascii; private static final Charset utf8; - private static final Charset utf16; static { ascii = Charset.forName("ISO-8859-1"); utf8 = Charset.forName("UTF-8"); - utf16 = Charset.forName("UTF-16LE"); - } - - private static final Accessor memUtil; - - static { - Accessor util; - try { - // Depends on java.nio.Buffer#address and sun.misc.Unsafe - util = loadAccessor("org.lwjgl.MemoryUtilSun$AccessorUnsafe"); - } catch (Exception e0) { - try { - // Depends on java.nio.Buffer#address and sun.reflect.FieldAccessor - util = loadAccessor("org.lwjgl.MemoryUtilSun$AccessorReflectFast"); - } catch (Exception e1) { - try { - // Depends on java.nio.Buffer#address - util = new AccessorReflect(); - } catch (Exception e2) { - LWJGLUtil.log("Unsupported JVM detected, this will likely result in low performance. Please inform LWJGL developers."); - util = new AccessorJNI(); - } - } - } - - LWJGLUtil.log("MemoryUtil Accessor: " + util.getClass().getSimpleName()); - memUtil = util; - - /* - BENCHMARK RESULTS - Oracle Server VM: - - Unsafe: 4ns - ReflectFast: 8ns - Reflect: 10ns - JNI: 82ns - - BENCHMARK RESULTS - Oracle Client VM: - - Unsafe: 5ns - ReflectFast: 81ns - Reflect: 85ns - JNI: 87ns - - On non-Oracle VMs, Unsafe should be the fastest implementation as well. In the absence - of Unsafe, performance will depend on how reflection and JNI are implemented. For now - we'll go with what we see on the Oracle VM (that is, we'll prefer reflection over JNI). - */ } private MemoryUtil() { @@ -110,13 +62,13 @@ public final class MemoryUtil { * * @return the memory address */ - public static long getAddress0(Buffer buffer) { return memUtil.getAddress(buffer); } + public static long getAddress0(Buffer buffer) { return org.lwjgl.system.MemoryUtil.memAddress0(buffer); } - public static long getAddress0Safe(Buffer buffer) { return buffer == null ? 0L : memUtil.getAddress(buffer); } + public static long getAddress0Safe(Buffer buffer) { return buffer == null ? 0L : getAddress0(buffer); } - public static long getAddress0(PointerBuffer buffer) { return memUtil.getAddress(buffer.getBuffer()); } + public static long getAddress0(PointerBuffer buffer) { return getAddress0(buffer.getBuffer()); } - public static long getAddress0Safe(PointerBuffer buffer) { return buffer == null ? 0L : memUtil.getAddress(buffer.getBuffer()); } + public static long getAddress0Safe(PointerBuffer buffer) { return buffer == null ? 0L : getAddress0(buffer.getBuffer()); } // --- [ API utilities ] --- @@ -225,7 +177,7 @@ public final class MemoryUtil { * @return the encoded text */ public static ByteBuffer encodeUTF16(final CharSequence text) { - return encode(text, utf16); + return org.lwjgl.system.MemoryUtil.memUTF16(text); } /** @@ -295,7 +247,7 @@ public final class MemoryUtil { } public static String decodeUTF16(final ByteBuffer buffer) { - return decode(buffer, utf16); + return org.lwjgl.system.MemoryUtil.memUTF16(buffer); } private static String decode(final ByteBuffer buffer, final Charset charset) { diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/openal/AL.java b/jre_lwjgl3glfw/src/main/java/org/lwjgl/openal/AL.java index 8c2a288fd..8b25f2d0c 100644 --- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/openal/AL.java +++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/openal/AL.java @@ -4,7 +4,8 @@ */ package org.lwjgl.openal; -import org.lwjgl.*; +import org.lwjgl.BufferUtils; +import org.lwjgl.LWJGLException; import org.lwjgl.system.*; import javax.annotation.*; diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/ARBShaderObjects.java b/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/ARBShaderObjects.java index c78c2f3fa..634279dba 100644 --- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/ARBShaderObjects.java +++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/ARBShaderObjects.java @@ -9,8 +9,7 @@ import javax.annotation.*; import java.nio.*; -import org.lwjgl.*; - +import org.lwjgl.PointerBuffer; import org.lwjgl.system.*; import static org.lwjgl.system.Checks.*; diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/GL11.java b/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/GL11.java index 32835e5e2..687d98aa1 100644 --- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/GL11.java +++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/GL11.java @@ -9,7 +9,7 @@ import javax.annotation.*; import java.nio.*; -import org.lwjgl.*; +import org.lwjgl.PointerBuffer; import org.lwjgl.system.*; diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/GL15.java b/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/GL15.java index 373c620e3..693c4fa68 100644 --- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/GL15.java +++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/GL15.java @@ -9,8 +9,7 @@ import javax.annotation.*; import java.nio.*; -import org.lwjgl.*; - +import org.lwjgl.PointerBuffer; import org.lwjgl.system.*; import static org.lwjgl.system.Checks.*; diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/GL20.java b/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/GL20.java index 92151666e..b4e164e40 100644 --- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/GL20.java +++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/GL20.java @@ -9,7 +9,8 @@ import javax.annotation.*; import java.nio.*; -import org.lwjgl.*; +import org.lwjgl.BufferUtils; +import org.lwjgl.PointerBuffer; import org.lwjgl.system.*;