TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-14 15:17:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Input pipe debug

Browse Source
This commit is contained in:
khanhduytran0 2020-11-03 15:47:18 +07:00
parent da14e640a7
commit aa61926fca
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/jni/Android.mk
View File

@ -6,7 +6,8 @@ include $(CLEAR_VARS)
LOCAL_LDLIBS := -ldl -llog -landroid -lEGL LOCAL_LDLIBS := -ldl -llog -landroid -lEGL
# -lGLESv2 # -lGLESv2
LOCAL_MODULE := pojavexec LOCAL_MODULE := pojavexec
# LOCAL_CFLAGS += -DGLES_TEST LOCAL_CFLAGS += -DDEBUG
# -DGLES_TEST
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
egl_bridge.c \ egl_bridge.c \
input_bridge_v3.c \ input_bridge_v3.c \

18
app/src/main/jni/input_bridge_v3.c
View File

@ -78,6 +78,9 @@ ADD_CALLBACK_WWIN(WindowSize);
#undef ADD_CALLBACK_WWIN #undef ADD_CALLBACK_WWIN
void attachThread(bool isAndroid, JNIEnv** secondJNIEnvPtr) { void attachThread(bool isAndroid, JNIEnv** secondJNIEnvPtr) {
#ifdef DEBUG
LOGD("Debug: Attaching %s thread to %s, javavm.isNull=%d\n", isAndroid ? "Android" : "JRE", isAndroid ? "JRE" : "Android", (isAndroid ? runtimeJavaVMPtr : dalvikJavaVMPtr) == NULL);
#endif
if (isAndroid && runtimeJavaVMPtr) { if (isAndroid && runtimeJavaVMPtr) {
(*runtimeJavaVMPtr)->AttachCurrentThread(runtimeJavaVMPtr, secondJNIEnvPtr, NULL); (*runtimeJavaVMPtr)->AttachCurrentThread(runtimeJavaVMPtr, secondJNIEnvPtr, NULL);
} else if (!isAndroid && dalvikJavaVMPtr) { } else if (!isAndroid && dalvikJavaVMPtr) {
@ -86,6 +89,9 @@ void attachThread(bool isAndroid, JNIEnv** secondJNIEnvPtr) {
} }
void getJavaInputBridge(jclass* clazz, jmethodID* method) { void getJavaInputBridge(jclass* clazz, jmethodID* method) {
#ifdef DEBUG
LOGD("Debug: Initializing input bridge, method.isNull=%d, jnienv.isNull=%d\n", *method == NULL, runtimeJNIEnvPtr_ANDROID == NULL);
#endif
if (*method == NULL && runtimeJNIEnvPtr_ANDROID != NULL) { if (*method == NULL && runtimeJNIEnvPtr_ANDROID != NULL) {
*clazz = (*runtimeJNIEnvPtr_ANDROID)->FindClass(runtimeJNIEnvPtr_ANDROID, "org/lwjgl/glfw/CallbackBridge"); *clazz = (*runtimeJNIEnvPtr_ANDROID)->FindClass(runtimeJNIEnvPtr_ANDROID, "org/lwjgl/glfw/CallbackBridge");
assert(*clazz != NULL); assert(*clazz != NULL);
@ -95,6 +101,9 @@ void getJavaInputBridge(jclass* clazz, jmethodID* method) {
} }
void sendData(int type, int i1, int i2, int i3, int i4) { void sendData(int type, int i1, int i2, int i3, int i4) {
#ifdef DEBUG
LOGD("Debug: Send data, jnienv.isNull=%d\n", runtimeJNIEnvPtr_ANDROID == NULL);
#endif
if (runtimeJNIEnvPtr_ANDROID != NULL) { if (runtimeJNIEnvPtr_ANDROID != NULL) {
(*runtimeJNIEnvPtr_ANDROID)->CallStaticVoidMethod( (*runtimeJNIEnvPtr_ANDROID)->CallStaticVoidMethod(
runtimeJNIEnvPtr_ANDROID, runtimeJNIEnvPtr_ANDROID,
@ -107,6 +116,9 @@ void sendData(int type, int i1, int i2, int i3, int i4) {
} }
JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeAttachThreadToOther(JNIEnv* env, jclass clazz, jboolean isAndroid, jboolean isUseStackQueue) { JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeAttachThreadToOther(JNIEnv* env, jclass clazz, jboolean isAndroid, jboolean isUseStackQueue) {
#ifdef DEBUG
LOGD("Debug: JNI attaching thread, isUseStackQueue=%d\n", isUseStackQueue);
#endif
isUseStackQueueCall = (int) isUseStackQueue; isUseStackQueueCall = (int) isUseStackQueue;
if (isAndroid) { if (isAndroid) {
attachThread(true, &runtimeJNIEnvPtr_ANDROID); attachThread(true, &runtimeJNIEnvPtr_ANDROID);
@ -122,6 +134,9 @@ JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeAttachThreadToOt
} }
JNIEXPORT jstring JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeClipboard(JNIEnv* env, jclass clazz, jint action, jstring copy) { JNIEXPORT jstring JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeClipboard(JNIEnv* env, jclass clazz, jint action, jstring copy) {
#ifdef DEBUG
LOGD("Debug: Clipboard access is going on\n", isUseStackQueue);
#endif
// TODO: if crash here, then convert jstring to jstring (diff JVM) // TODO: if crash here, then convert jstring to jstring (diff JVM)
jclass bridgeClazz = (*dalvikJNIEnvPtr_JRE)->FindClass(dalvikJNIEnvPtr_JRE, "org/lwjgl/glfw/CallbackBridge"); jclass bridgeClazz = (*dalvikJNIEnvPtr_JRE)->FindClass(dalvikJNIEnvPtr_JRE, "org/lwjgl/glfw/CallbackBridge");
assert(bridgeClazz != NULL); assert(bridgeClazz != NULL);
@ -132,6 +147,9 @@ JNIEXPORT jstring JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeClipboard(JNI
} }
JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSetInputReady(JNIEnv* env, jclass clazz, jboolean inputReady) { JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSetInputReady(JNIEnv* env, jclass clazz, jboolean inputReady) {
#ifdef DEBUG
LOGD("Debug: Changing input state, isReady=%d, isUseStackQueueCall=%d\n", inputReady, isUseStackQueueCall);
#endif
isInputReady = inputReady; isInputReady = inputReady;
return isUseStackQueueCall; return isUseStackQueueCall;
} }