mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-17 16:47:14 -04:00
Remove GL4ES 1.1.5 (mc 1.7.10 broken on it)
Fixes after cleanup
This commit is contained in:
parent
d1be63ab8b
commit
567d801f5c
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
// TODO: check for memory leaks
|
// TODO: check for memory leaks
|
||||||
// int printed = 0;
|
// int printed = 0;
|
||||||
JNIEXPORT jintArray JNICALL Java_net_kdt_pojavlaunch_JREUtils_renderAWTScreenFrame(JNIEnv* env, jclass clazz /*, jobject canvas, jint width, jint height */) {
|
JNIEXPORT jintArray JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_renderAWTScreenFrame(JNIEnv* env, jclass clazz /*, jobject canvas, jint width, jint height */) {
|
||||||
if (runtimeJNIEnvPtr_ANDROID == NULL) {
|
if (runtimeJNIEnvPtr_ANDROID == NULL) {
|
||||||
if (runtimeJavaVMPtr == NULL) {
|
if (runtimeJavaVMPtr == NULL) {
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -55,7 +55,7 @@ void terminateEgl() {
|
|||||||
potatoBridge.eglSurface = EGL_NO_SURFACE;
|
potatoBridge.eglSurface = EGL_NO_SURFACE;
|
||||||
}
|
}
|
||||||
|
|
||||||
JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_JREUtils_setupBridgeWindow(JNIEnv* env, jclass clazz, jobject surface) {
|
JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_setupBridgeWindow(JNIEnv* env, jclass clazz, jobject surface) {
|
||||||
potatoBridge.androidWindow = ANativeWindow_fromSurface(env, surface);
|
potatoBridge.androidWindow = ANativeWindow_fromSurface(env, surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ void free_char_array(JNIEnv *env, jobjectArray jstringArray, const char **charAr
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_JREUtils_setupBridgeSurfaceAWT(JNIEnv *env, jclass clazz, jlong surface) {
|
JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_setupBridgeSurfaceAWT(JNIEnv *env, jclass clazz, jlong surface) {
|
||||||
shared_awt_surface = surface;
|
shared_awt_surface = surface;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -71,7 +71,7 @@ JNIEXPORT jint JNICALL Java_android_os_OpenJDKNativeRegister_nativeRegisterNativ
|
|||||||
return (jint) result;
|
return (jint) result;
|
||||||
}
|
}
|
||||||
|
|
||||||
JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_JREUtils_setLdLibraryPath(JNIEnv *env, jclass clazz, jstring ldLibraryPath) {
|
JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_setLdLibraryPath(JNIEnv *env, jclass clazz, jstring ldLibraryPath) {
|
||||||
// jclass exception_cls = (*env)->FindClass(env, "java/lang/UnsatisfiedLinkError");
|
// jclass exception_cls = (*env)->FindClass(env, "java/lang/UnsatisfiedLinkError");
|
||||||
|
|
||||||
android_update_LD_LIBRARY_PATH_t android_update_LD_LIBRARY_PATH;
|
android_update_LD_LIBRARY_PATH_t android_update_LD_LIBRARY_PATH;
|
||||||
@ -93,7 +93,7 @@ JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_JREUtils_setLdLibraryPath(JNIEnv
|
|||||||
(*env)->ReleaseStringUTFChars(env, ldLibraryPath, ldLibPathUtf);
|
(*env)->ReleaseStringUTFChars(env, ldLibraryPath, ldLibPathUtf);
|
||||||
}
|
}
|
||||||
|
|
||||||
JNIEXPORT jboolean JNICALL Java_net_kdt_pojavlaunch_JREUtils_dlopen(JNIEnv *env, jclass clazz, jstring name) {
|
JNIEXPORT jboolean JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_dlopen(JNIEnv *env, jclass clazz, jstring name) {
|
||||||
const char *nameUtf = (*env)->GetStringUTFChars(env, name, 0);
|
const char *nameUtf = (*env)->GetStringUTFChars(env, name, 0);
|
||||||
void* handle = dlopen(nameUtf, RTLD_GLOBAL | RTLD_LAZY);
|
void* handle = dlopen(nameUtf, RTLD_GLOBAL | RTLD_LAZY);
|
||||||
if (!handle) {
|
if (!handle) {
|
||||||
@ -105,14 +105,14 @@ JNIEXPORT jboolean JNICALL Java_net_kdt_pojavlaunch_JREUtils_dlopen(JNIEnv *env,
|
|||||||
return handle != NULL;
|
return handle != NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
JNIEXPORT jint JNICALL Java_net_kdt_pojavlaunch_JREUtils_chdir(JNIEnv *env, jclass clazz, jstring nameStr) {
|
JNIEXPORT jint JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_chdir(JNIEnv *env, jclass clazz, jstring nameStr) {
|
||||||
const char *name = (*env)->GetStringUTFChars(env, nameStr, NULL);
|
const char *name = (*env)->GetStringUTFChars(env, nameStr, NULL);
|
||||||
int retval = chdir(name);
|
int retval = chdir(name);
|
||||||
(*env)->ReleaseStringUTFChars(env, nameStr, name);
|
(*env)->ReleaseStringUTFChars(env, nameStr, name);
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
JNIEXPORT jint JNICALL Java_net_kdt_pojavlaunch_JREUtils_executeBinary(JNIEnv *env, jclass clazz, jobjectArray cmdArgs) {
|
JNIEXPORT jint JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_executeBinary(JNIEnv *env, jclass clazz, jobjectArray cmdArgs) {
|
||||||
jclass exception_cls = (*env)->FindClass(env, "java/lang/UnsatisfiedLinkError");
|
jclass exception_cls = (*env)->FindClass(env, "java/lang/UnsatisfiedLinkError");
|
||||||
jstring execFile = (*env)->GetObjectArrayElement(env, cmdArgs, 0);
|
jstring execFile = (*env)->GetObjectArrayElement(env, cmdArgs, 0);
|
||||||
|
|
||||||
@ -148,7 +148,7 @@ JNIEXPORT jint JNICALL Java_net_kdt_pojavlaunch_JREUtils_executeBinary(JNIEnv *e
|
|||||||
|
|
||||||
// METHOD 2
|
// METHOD 2
|
||||||
/*
|
/*
|
||||||
JNIEXPORT jint JNICALL Java_net_kdt_pojavlaunch_JREUtils_executeForkedBinary(JNIEnv *env, jclass clazz, jobjectArray cmdArgs) {
|
JNIEXPORT jint JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_executeForkedBinary(JNIEnv *env, jclass clazz, jobjectArray cmdArgs) {
|
||||||
int x, status;
|
int x, status;
|
||||||
x = fork();
|
x = fork();
|
||||||
if (x > 0) {
|
if (x > 0) {
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user