[Misc] (...): Changes for MobileGlues 1.3.4

BZLZHH · BZLZHH · commit 125e454288c6 · 2026-02-12T01:34:10.000+08:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,8 +15,8 @@ android {
         applicationId = "com.fcl.plugin.mobileglues"
         minSdk = 26
         targetSdk = 36
-        versionCode = 1330
-        versionName = "1.3.3"
+        versionCode = 1340
+        versionName = "1.3.4"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
@@ -1,12 +1,38 @@
 cmake_minimum_required(VERSION 3.10)
-project("mobileglues_info_getter")
+project(mobileglues_info_getter)
 
-add_library(mobileglues_info_getter SHARED mobileglues_info_getter.cpp)
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
+add_library(mobileglues_info_getter SHARED
+    mobileglues_info_getter.cpp
+)
 
-find_library(log-lib log)
 find_library(android-lib android)
 
-set(PLATFORM_LIBS ${log-lib} dl ${android-lib})
+target_compile_options(mobileglues_info_getter PRIVATE
+    -Oz
+    -fdata-sections
+    -ffunction-sections
+    -fvisibility=hidden
+    -fvisibility-inlines-hidden
+    -fno-rtti
+    -fno-exceptions
+    -flto
+)
+
+target_link_options(mobileglues_info_getter PRIVATE
+    -Wl,--gc-sections
+    -Wl,--strip-all
+    -flto
+)
+
+target_include_directories(mobileglues_info_getter PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
 
-target_include_directories(mobileglues_info_getter PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(mobileglues_info_getter ${PLATFORM_LIBS})
+target_link_libraries(mobileglues_info_getter
+    ${android-lib}
+    dl
+)
diff --git a/app/src/main/cpp/mobileglues_info_getter.cpp b/app/src/main/cpp/mobileglues_info_getter.cpp
@@ -5,7 +5,7 @@ static void* mg_handle = nullptr;
 static void* try_load_symbol(void* handle, const char* name) {
     void* s = dlsym(handle, name);
     if (!s) {
-        LOGE("Error: dlsym %s failed: %s", name, dlerror());
+        fprintf(stderr, "Error: dlsym %s failed: %s", name, dlerror());
     }
     return s;
 }
@@ -14,7 +14,7 @@ static bool load_mobile_symbols() {
     if (mg_handle) return true;
     mg_handle = dlopen("libmobileglues.so", RTLD_NOW | RTLD_LOCAL);
     if (!mg_handle) {
-        LOGE("Error: dlopen libmobileglues.so failed: %s", dlerror());
+        fprintf(stderr, "Error: dlopen libmobileglues.so failed: %s", dlerror());
         return false;
     }
 
@@ -41,7 +41,7 @@ static bool load_mobile_symbols() {
     }
 
     if (!p_eglGetDisplay || !p_eglInitialize || !p_eglChooseConfig || !p_eglCreatePbufferSurface || !p_eglCreateContext || !p_eglMakeCurrent || !p_glGetString || !p_glGetIntegerv) {
-        LOGE("Error: some required symbols are missing");
+        fprintf(stderr, "Error: some required symbols are missing");
         return false;
     }
 
@@ -88,7 +88,7 @@ static std::string create_context_and_query() {
 
     context = p_eglCreateContext(display, config, EGL_NO_CONTEXT, ctxAttribs3);
     if (context == EGL_NO_CONTEXT) {
-        LOGI("Error: ES3 context failed, try ES2");
+        fprintf(stderr, "Error: ES3 context failed, try ES2");
         context = p_eglCreateContext(display, config, EGL_NO_CONTEXT, ctxAttribs2);
     }
 
@@ -199,14 +199,14 @@ JNIEXPORT jstring JNICALL
 Java_com_fcl_plugin_mobileglues_MGGLInfoDialogBuilder_getMobileGluesGLInfo(JNIEnv *env,
                                                                           jobject thiz) {
     std::string res = create_context_and_query();
-    LOGI("MobileGlues GL Info: \n%s", res.c_str());
+    printf("MobileGlues GL Info: \n%s", res.c_str());
     return env->NewStringUTF(res.c_str());
 }
 
 JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     (void)vm;
     (void)reserved;
-    LOGI("JNI_OnLoad called");
+    printf("JNI_OnLoad called");
     return JNI_VERSION_1_6;
 }
 
diff --git a/app/src/main/cpp/mobileglues_info_getter.h b/app/src/main/cpp/mobileglues_info_getter.h
@@ -9,9 +9,6 @@
 #include <GLES3/gl3.h>
 #include "MG/extensions.h"
 
-#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, "MobileGluesInfoGetter", __VA_ARGS__)
-#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, "MobileGluesInfoGetter", __VA_ARGS__)
-
 typedef EGLDisplay (*PFN_eglGetDisplay)(EGLNativeDisplayType);
 typedef EGLBoolean (*PFN_eglInitialize)(EGLDisplay, EGLint*, EGLint*);
 typedef EGLBoolean (*PFN_eglChooseConfig)(EGLDisplay, const EGLint*, EGLConfig*, EGLint, EGLint*);
diff --git a/app/src/main/java/com/fcl/plugin/mobileglues/MainActivity.kt b/app/src/main/java/com/fcl/plugin/mobileglues/MainActivity.kt
@@ -477,7 +477,6 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener,
             binding.spinnerNoError.setSelection(cfg.enableNoError)
             binding.spinnerMultidrawMode.setSelection(cfg.multidrawMode)
             binding.angleClearWorkaround.setSelection(cfg.angleDepthClearFixMode)
-            binding.switchExtGl43.isChecked = cfg.enableExtGL43 == 1
             binding.switchExtTimerQuery.isChecked = cfg.enableExtTimerQuery == 0
             binding.switchExtDirectStateAccess.isChecked = cfg.enableExtDirectStateAccess == 1
             binding.switchExtCs.isChecked = cfg.enableExtComputeShader == 1
@@ -529,7 +528,6 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener,
         binding.spinnerCustomGlVersion.onItemSelectedListener = itemListener
         binding.angleClearWorkaround.onItemSelectedListener = itemListener
 
-        binding.switchExtGl43.setOnCheckedChangeListener(checkedListener)
         binding.switchExtCs.setOnCheckedChangeListener(checkedListener)
         binding.switchExtTimerQuery.setOnCheckedChangeListener(checkedListener)
         binding.switchExtDirectStateAccess.setOnCheckedChangeListener(checkedListener)
@@ -717,14 +715,6 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener,
         if (config == null) return
 
         when (compoundButton.id) {
-            R.id.switch_ext_gl43 -> handleSwitchWithWarning(
-                isChecked,
-                R.string.warning_ext_gl43_enable,
-                { config?.enableExtGL43 = 1 },
-                { config?.enableExtGL43 = 0 },
-                compoundButton
-            )
-
             R.id.switch_ext_cs -> handleSwitchWithWarning(
                 isChecked,
                 R.string.warning_ext_cs_enable,
diff --git a/app/src/main/java/com/fcl/plugin/mobileglues/settings/MGConfig.kt b/app/src/main/java/com/fcl/plugin/mobileglues/settings/MGConfig.kt
@@ -23,7 +23,6 @@ data class MGConfig(val context: Context) {
     // 使用 Delegates.observable 委托属性
     var enableANGLE: Int by Delegates.observable(1) { _, old, new -> if (old != new) save() }
     var enableNoError: Int by Delegates.observable(0) { _, old, new -> if (old != new) save() }
-    var enableExtGL43: Int by Delegates.observable(0) { _, old, new -> if (old != new) save() }
     var enableExtTimerQuery: Int by Delegates.observable(1) { _, old, new -> if (old != new) save() }
     var enableExtComputeShader: Int by Delegates.observable(0) { _, old, new -> if (old != new) save() }
     var enableExtDirectStateAccess: Int by Delegates.observable(0) { _, old, new -> if (old != new) save() }
@@ -67,7 +66,6 @@ data class MGConfig(val context: Context) {
                 Gson().fromJson(configStr, JsonObject::class.java).apply {
                     config.enableANGLE = this.get("enableANGLE")?.asInt ?: 1
                     config.enableNoError = this.get("enableNoError")?.asInt ?: 0
-                    config.enableExtGL43 = this.get("enableExtGL43")?.asInt ?: 0
                     config.enableExtTimerQuery = this.get("enableExtTimerQuery")?.asInt ?: 1
                     config.enableExtComputeShader = this.get("enableExtComputeShader")?.asInt ?: 0
                     config.enableExtDirectStateAccess =
@@ -160,7 +158,6 @@ data class MGConfig(val context: Context) {
         return mapOf(
             "enableANGLE" to enableANGLE,
             "enableNoError" to enableNoError,
-            "enableExtGL43" to enableExtGL43,
             "enableExtTimerQuery" to enableExtTimerQuery,
             "enableExtComputeShader" to enableExtComputeShader,
             "enableExtDirectStateAccess" to enableExtDirectStateAccess,
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -141,13 +141,6 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
                 android:minHeight="48dp"
-                app:layout_constraintBottom_toTopOf="@+id/switch_ext_gl43" />
-
-            <com.google.android.material.materialswitch.MaterialSwitch
-                android:id="@+id/switch_ext_gl43"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/option_ext_gl43"
                 app:layout_constraintBottom_toTopOf="@+id/switch_ext_cs" />
 
             <com.google.android.material.materialswitch.MaterialSwitch
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -36,13 +36,12 @@
     <string name="option_multidraw_mode_basevertex">尽量使用 BaseVertex 方案模拟</string>
     <string name="option_multidraw_mode_multidraw_indirect">尽量使用 MultiDraw Indirect 方案模拟</string>
     <string name="option_multidraw_mode_drawelements">强制使用 DrawElements 方案模拟</string>
-    <string name="option_multidraw_mode_compute">尽量使用 Compute 方案模拟 (实验性)</string>
+    <string name="option_multidraw_mode_compute">尽量使用 Compute 方案模拟</string>
 
     <string name="option_angle_clear_workaround">ANGLE Depth Clear 修复方案</string>
     <string name="option_angle_clear_workaround_disable">不启用</string>
     <string name="option_angle_clear_workaround_enable_1">启用方案 #1</string>
 
-    <string name="option_ext_gl43">启用不完整的 OpenGL43 扩展</string>
     <string name="option_ext_cs">启用不完整的 ARB_compute_shader 扩展</string>
     <string name="option_ext_timer_query">禁用推荐的 timer_query 扩展</string>
     <string name="option_ext_direct_state_access">启用高级的 direct_state_access 扩展</string>
@@ -68,7 +67,6 @@
     <string name="dialog_permission_msg_android_Q">修改渲染选项需要读写权限，请授予读写权限后再修改。\n您稍后需要选择这个目录：\n%s\n若不存在名为 MG 的文件夹，请自行创建名为 MG 的文件夹。</string>
 
     <string name="dialog_title_warning">警告</string>
-    <string name="warning_ext_gl43_enable">启用不完整的 OpenGL43 扩展可能会导致部分光影、Mods 错误，是否继续？</string>
     <string name="warning_ext_cs_enable">启用不完整的 ARB_compute_shader 扩展可能会导致部分光影、Mods 错误，是否继续？</string>
     <string name="warning_adreno_740_angle">在 Adreno 740 设备上启用 ANGLE 极有可能导致严重渲染错误，是否继续？</string>
     <string name="warning_enabling_angle_clear_workaround">启用 ANGLE Depth Clear 修复会修复 ANGLE 在 Minecraft 1.21.5+ 原版中的手持物品被遮挡的问题，但会导致性能下降，是否继续？</string>
@@ -105,4 +103,4 @@
     <string name="loading">加载中…</string>
     <string name="dialog_mg_gl_info_title">MobileGlues 信息</string>
     <string name="dismiss">关闭</string>
-</resources>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -40,13 +40,12 @@
     <string name="option_multidraw_mode_basevertex">Prefer BaseVertex</string>
     <string name="option_multidraw_mode_multidraw_indirect">Prefer MultiDraw Indirect</string>
     <string name="option_multidraw_mode_drawelements">Force DrawElements</string>
-    <string name="option_multidraw_mode_compute">Prefer Compute (experimental)</string>
+    <string name="option_multidraw_mode_compute">Prefer Compute</string>
 
     <string name="option_angle_clear_workaround">ANGLE Depth Clear Workaround</string>
     <string name="option_angle_clear_workaround_disable">Disable</string>
     <string name="option_angle_clear_workaround_enable_1">Enable workaround #1</string>
 
-    <string name="option_ext_gl43">Enable Incomplete \'OpenGL43\' Extension</string>
     <string name="option_ext_cs">Enable Incomplete \'ARB_compute_shader\' Extension</string>
     <string name="option_ext_timer_query">Disable Recommended \'timer_query\' Extension</string>
     <string name="option_ext_direct_state_access">Enable Advanced \'direct_state_access\' Extension</string>
@@ -72,7 +71,6 @@
     <string name="dialog_permission_msg_android_Q">Modifying rendering options requires read and write permissions. Please grant read and write permissions before making changes.\nYou will need to select this directory later: \n%s\nIf a folder named MG does not exist, please create one manually.</string>
 
     <string name="dialog_title_warning">Warning</string>
-    <string name="warning_ext_gl43_enable">Enabling the incomplete OpenGL43 extension may cause issues with some shaders and mods. Are you sure you want to continue?</string>
     <string name="warning_ext_cs_enable">Enabling the incomplete ARB_compute_shader extension may cause issues with some shaders and mods. Are you sure you want to continue?</string>
     <string name="warning_adreno_740_angle">Enabling ANGLE on Adreno 740 devices is highly likely to cause severe rendering issues. Are you sure you want to continue?</string>
     <string name="warning_enabling_angle_clear_workaround">Enabling the ANGLE Depth Clear Workaround fixes the issue of the handheld items being obscured in vanilla Minecraft 1.21.5+, but may cause performance degradation. Are you sure you want to continue?</string>
@@ -107,4 +105,4 @@ Please note, this action is <b><font color="@colorError">irreversible</font></b>
     <string name="loading">Loading…</string>
     <string name="dialog_mg_gl_info_title">MobileGlues Info</string>
     <string name="dismiss">Dismiss</string>
-</resources>
+</resources>

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ static void* mg_handle = nullptr;`
`5`	`5`	`static void* try_load_symbol(void* handle, const char* name) {`
`6`	`6`	`void* s = dlsym(handle, name);`
`7`	`7`	`if (!s) {`
`8`		`- LOGE("Error: dlsym %s failed: %s", name, dlerror());`
	`8`	`+ fprintf(stderr, "Error: dlsym %s failed: %s", name, dlerror());`
`9`	`9`	`}`
`10`	`10`	`return s;`
`11`	`11`	`}`
`@@ -14,7 +14,7 @@ static bool load_mobile_symbols() {`
`14`	`14`	`if (mg_handle) return true;`
`15`	`15`	`mg_handle = dlopen("libmobileglues.so", RTLD_NOW \| RTLD_LOCAL);`
`16`	`16`	`if (!mg_handle) {`
`17`		`- LOGE("Error: dlopen libmobileglues.so failed: %s", dlerror());`
	`17`	`+ fprintf(stderr, "Error: dlopen libmobileglues.so failed: %s", dlerror());`
`18`	`18`	`return false;`
`19`	`19`	`}`
`20`	`20`
`@@ -41,7 +41,7 @@ static bool load_mobile_symbols() {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`if (!p_eglGetDisplay \|\| !p_eglInitialize \|\| !p_eglChooseConfig \|\| !p_eglCreatePbufferSurface \|\| !p_eglCreateContext \|\| !p_eglMakeCurrent \|\| !p_glGetString \|\| !p_glGetIntegerv) {`
`44`		`- LOGE("Error: some required symbols are missing");`
	`44`	`+ fprintf(stderr, "Error: some required symbols are missing");`
`45`	`45`	`return false;`
`46`	`46`	`}`
`47`	`47`
`@@ -88,7 +88,7 @@ static std::string create_context_and_query() {`
`88`	`88`
`89`	`89`	`context = p_eglCreateContext(display, config, EGL_NO_CONTEXT, ctxAttribs3);`
`90`	`90`	`if (context == EGL_NO_CONTEXT) {`
`91`		`- LOGI("Error: ES3 context failed, try ES2");`
	`91`	`+ fprintf(stderr, "Error: ES3 context failed, try ES2");`
`92`	`92`	`context = p_eglCreateContext(display, config, EGL_NO_CONTEXT, ctxAttribs2);`
`93`	`93`	`}`
`94`	`94`
`@@ -199,14 +199,14 @@ JNIEXPORT jstring JNICALL`
`199`	`199`	`Java_com_fcl_plugin_mobileglues_MGGLInfoDialogBuilder_getMobileGluesGLInfo(JNIEnv *env,`
`200`	`200`	`jobject thiz) {`
`201`	`201`	`std::string res = create_context_and_query();`
`202`		`- LOGI("MobileGlues GL Info: \n%s", res.c_str());`
	`202`	`+ printf("MobileGlues GL Info: \n%s", res.c_str());`
`203`	`203`	`return env->NewStringUTF(res.c_str());`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {`
`207`	`207`	`(void)vm;`
`208`	`208`	`(void)reserved;`
`209`		`- LOGI("JNI_OnLoad called");`
	`209`	`+ printf("JNI_OnLoad called");`
`210`	`210`	`return JNI_VERSION_1_6;`
`211`	`211`	`}`
`212`	`212`