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

Fix[input_bridge]: resizing race condition

Browse Source
This commit is contained in:
artdeell 2024-11-22 18:05:56 +03:00
parent fe78b94119
commit f16c039470
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app_pojavlauncher/src/main/jni/environ/environ.h
View File

@ -55,7 +55,8 @@ struct pojav_environ_s {
JavaVM* dalvikJavaVMPtr; JavaVM* dalvikJavaVMPtr;
JNIEnv* dalvikJNIEnvPtr_ANDROID; JNIEnv* dalvikJNIEnvPtr_ANDROID;
long showingWindow; long showingWindow;
bool isInputReady, isCursorEntered, isUseStackQueueCall, shouldUpdateMouse, shouldUpdateMonitorSize; bool isInputReady, isCursorEntered, isUseStackQueueCall, shouldUpdateMouse;
bool shouldUpdateMonitorSize, monitorSizeConsumed;
int savedWidth, savedHeight; int savedWidth, savedHeight;
#define ADD_CALLBACK_WWIN(NAME) \ #define ADD_CALLBACK_WWIN(NAME) \
GLFW_invoke_##NAME##_func* GLFW_invoke_##NAME; GLFW_invoke_##NAME##_func* GLFW_invoke_##NAME;

15
app_pojavlauncher/src/main/jni/input_bridge_v3.c
View File

@ -160,6 +160,8 @@ void pojavStartPumping() {
if(pojav_environ->shouldUpdateMonitorSize) { if(pojav_environ->shouldUpdateMonitorSize) {
// Perform a monitor size update here to avoid doing it on every single window // Perform a monitor size update here to avoid doing it on every single window
updateMonitorSize(pojav_environ->savedWidth, pojav_environ->savedHeight); updateMonitorSize(pojav_environ->savedWidth, pojav_environ->savedHeight);
// Mark the monitor size as consumed (since GLFW was made aware of it)
pojav_environ->monitorSizeConsumed = true;
} }
} }
@ -171,7 +173,14 @@ void pojavStopPumping() {
atomic_fetch_sub_explicit(&pojav_environ->eventCounter, pojav_environ->inEventCount, memory_order_acquire); atomic_fetch_sub_explicit(&pojav_environ->eventCounter, pojav_environ->inEventCount, memory_order_acquire);
// Make sure the next frame won't send mouse or monitor updates if it's unnecessary // Make sure the next frame won't send mouse or monitor updates if it's unnecessary
pojav_environ->shouldUpdateMouse = false; pojav_environ->shouldUpdateMouse = false;
pojav_environ->shouldUpdateMonitorSize = false; // Only reset the update flag if the monitor size was consumed by pojavStartPumping. This
// will delay the update to next frame if it had occured between pojavStartPumping and pojavStopPumping,
// but it's better than not having it apply at all
if(pojav_environ->shouldUpdateMonitorSize && pojav_environ->monitorSizeConsumed) {
pojav_environ->shouldUpdateMonitorSize = false;
pojav_environ->monitorSizeConsumed = false;
}
} }
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
@ -502,6 +511,10 @@ void noncritical_send_mouse_button(__attribute__((unused)) JNIEnv* env, __attrib
void critical_send_screen_size(jint width, jint height) { void critical_send_screen_size(jint width, jint height) {
pojav_environ->savedWidth = width; pojav_environ->savedWidth = width;
pojav_environ->savedHeight = height; pojav_environ->savedHeight = height;
// Even if there was call to pojavStartPumping that consumed the size, this call
// might happen right after it (or right before pojavStopPumping)
// So unmark the size as "consumed"
pojav_environ->monitorSizeConsumed = false;
pojav_environ->shouldUpdateMonitorSize = true; pojav_environ->shouldUpdateMonitorSize = true;
// Don't use the direct updates for screen dimensions. // Don't use the direct updates for screen dimensions.
// This is done to ensure that we have predictable conditions to correctly call // This is done to ensure that we have predictable conditions to correctly call