swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-08 20:28:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] (trace-replay): pass ANGLE path to APK retrace

Browse Source
This commit is contained in:
swung0x48
2026-06-22 12:30:10 +08:00
parent 565dc90bf0
commit 252e59334d
6 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MobileGL/MG_Util/BackendLoaders/OpenGL/Loader.cpp
+27 -4
View File
@@ -15,6 +15,19 @@ namespace MobileGL::MG_Util::BackendLoader {
return value != nullptr && std::strcmp(value, "1") == 0;
}
static Vector<String> AngleLibNames(const char* name) {
const char* angleDir = std::getenv("MOBILEGL_RETRACE_ANGLE_DIR");
if (angleDir != nullptr && angleDir[0] != '\0') {
String path = angleDir;
if (!path.empty() && path.back() != '/') {
path += "/";
}
path += name;
return {path, name};
}
return {name};
}
static void* OpenLib(const Vector<String>& names) {
#if !defined(__WIN32) && !defined(_WIN32) && !defined(__APPLE__)
static const String LibPathPrefixes[] = {
@@ -30,6 +43,7 @@ namespace MobileGL::MG_Util::BackendLoader {
for (const auto& name : names) {
String path_name = prefix + name;
if ((lib = dlopen(path_name.c_str(), flags))) {
MGLOG_I("Loaded GL backend library: %s", path_name.c_str());
return lib;
}
}
@@ -438,13 +452,22 @@ namespace MobileGL::MG_Util::BackendLoader {
}
void AcquireEGLFunctions(MG_External::EGLFunctionsTable& funcs) {
Vector<String> eglLibNames = {"libEGL.so"};
void* eglLib = nullptr;
if (UseRetraceAngle()) {
OpenLib({"libGLESv2_angle.so"});
eglLibNames = {"libEGL_angle.so", "libEGL.so"};
void* glesLib = OpenLib(AngleLibNames("libGLESv2_angle.so"));
if (!glesLib) {
MGLOG_E("Failed to open ANGLE libGLESv2_angle.so");
return;
}
eglLib = OpenLib(AngleLibNames("libEGL_angle.so"));
if (!eglLib) {
MGLOG_E("Failed to open ANGLE libEGL_angle.so");
return;
}
} else {
eglLib = OpenLib({"libEGL.so"});
}
void* eglLib = OpenLib(eglLibNames);
if (!eglLib) {
MGLOG_E("Failed to open EGL library");
return;
android-plugin/TRACE_REPLAY.md
+2 -1
View File
@@ -39,6 +39,7 @@ crop_y optional compare crop y
crop_width optional compare crop width
crop_height optional compare crop height
use_angle optional boolean; DirectGLES uses packaged ANGLE when true
angle_library_dir optional directory containing libEGL_angle.so and libGLESv2_angle.so; defaults to the APK native library directory
```
Implementation notes:
@@ -49,7 +50,7 @@ Implementation notes:
- `DirectGLES` replays on an EGL pbuffer by default, avoiding Android `SurfaceView` lifetime coupling. `DirectVulkan` still uses the Activity surface because it needs a native window-backed Vulkan swapchain.
- Golden comparison is implemented in native C++ with libpng RGBA decode. The Java Activity only passes arguments and displays the native result, so the replay/compare core is not tied to Android UI or Bitmap APIs and can be ported to Linux.
- The plugin profile still excludes `libtrace_replay_runner.so`; normal plugin APK behavior is preserved.
- Set `MOBILEGL_RETRACE_USE_ANGLE=1` when running `trace-replay-ci.sh` to pass `use_angle=true` for DirectGLES. The APK must include `libEGL_angle.so` and `libGLESv2_angle.so` under its x86_64 native libraries.
- Set `MOBILEGL_RETRACE_USE_ANGLE=1` when running `trace-replay-ci.sh` to pass `use_angle=true` for DirectGLES. The APK must include `libEGL_angle.so` and `libGLESv2_angle.so` under its x86_64 native libraries. The Activity passes Android's `nativeLibraryDir` to native code as `MOBILEGL_RETRACE_ANGLE_DIR`.
Example core-profile trace smoke command for a debug trace APK:
android-plugin/app/src/trace/cpp/trace_replay_core.cpp
+7
View File
@@ -129,6 +129,12 @@ bool LoadMobileGL(const Request& request, std::string& error) {
setenv("MOBILEGL_TRACE_SKIP_AUTODESTROY", "1", 1);
if (UseAngleForRequest(request)) {
setenv("MOBILEGL_RETRACE_USE_ANGLE", "1", 1);
if (!request.angleLibraryDir.empty()) {
setenv("MOBILEGL_RETRACE_ANGLE_DIR", request.angleLibraryDir.c_str(), 1);
}
} else {
unsetenv("MOBILEGL_RETRACE_USE_ANGLE");
unsetenv("MOBILEGL_RETRACE_ANGLE_DIR");
}
void* handle = dlopen(request.mobileGlLibrary.c_str(), RTLD_NOW | RTLD_GLOBAL);
@@ -738,6 +744,7 @@ bool WriteResultJson(const Request& request, const Result& result) {
file << " \"actualPath\": \"" << JsonEscape(result.actualPath) << "\",\n";
file << " \"diffPath\": \"" << JsonEscape(result.diffPath) << "\",\n";
file << " \"backend\": \"" << JsonEscape(request.backend) << "\",\n";
file << " \"angleLibraryDir\": \"" << JsonEscape(request.angleLibraryDir) << "\",\n";
file << " \"targetFrame\": " << request.targetFrame << ",\n";
file << " \"targetCall\": " << request.targetCall << ",\n";
file << " \"width\": " << request.width << ",\n";
android-plugin/app/src/trace/cpp/trace_replay_core.hpp
+1
View File
@@ -23,6 +23,7 @@ struct Request {
std::string diffPath;
std::string backend;
std::string mobileGlLibrary = "libMobileGL.so";
std::string angleLibraryDir;
int targetFrame = -1;
long long targetCall = -1;
int width = 0;
android-plugin/app/src/trace/cpp/trace_replay_jni.cpp
+2
View File
@@ -99,6 +99,7 @@ Java_top_mobilegl_plugin_trace_TraceReplayActivity_nativeRunTraceReplay(JNIEnv*
jint cropWidth,
jint cropHeight,
jint fuzzPercent,
jstring angleLibraryDir,
jboolean useAngle) {
mobilegl_trace::Request request;
request.tracePath = ToString(env, tracePath);
@@ -110,6 +111,7 @@ Java_top_mobilegl_plugin_trace_TraceReplayActivity_nativeRunTraceReplay(JNIEnv*
request.outputDir = ToString(env, outputDir);
request.diffPath = ToString(env, diffPath);
request.backend = ToString(env, backend);
request.angleLibraryDir = ToString(env, angleLibraryDir);
request.targetFrame = targetFrame;
request.targetCall = targetCall;
request.width = width;
android-plugin/app/src/trace/java/top/mobilegl/plugin/trace/TraceReplayActivity.java
+8 -1
View File
@@ -44,6 +44,7 @@ public final class TraceReplayActivity extends Activity {
request = TraceReplayRequest.from(
intent,
getFilesDir(),
getApplicationInfo().nativeLibraryDir,
getString(top.mobilegl.plugin.R.string.mobilegl_default_backend)
);
statusView = new TextView(this);
@@ -111,6 +112,7 @@ public final class TraceReplayActivity extends Activity {
request.cropWidth,
request.cropHeight,
request.fuzzPercent,
request.angleLibraryDir,
request.useAngle
);
Log.i(TAG, result.toString());
@@ -139,6 +141,7 @@ public final class TraceReplayActivity extends Activity {
int cropWidth,
int cropHeight,
int fuzzPercent,
String angleLibraryDir,
boolean useAngle
);
@@ -159,6 +162,7 @@ public final class TraceReplayActivity extends Activity {
final int cropWidth;
final int cropHeight;
final int fuzzPercent;
final String angleLibraryDir;
final boolean useAngle;
private TraceReplayRequest(
@@ -178,6 +182,7 @@ public final class TraceReplayActivity extends Activity {
int cropWidth,
int cropHeight,
int fuzzPercent,
String angleLibraryDir,
boolean useAngle
) {
this.tracePath = tracePath;
@@ -196,10 +201,11 @@ public final class TraceReplayActivity extends Activity {
this.cropWidth = cropWidth;
this.cropHeight = cropHeight;
this.fuzzPercent = fuzzPercent;
this.angleLibraryDir = angleLibraryDir;
this.useAngle = useAngle;
}
static TraceReplayRequest from(Intent intent, File filesDir, String defaultBackend) {
static TraceReplayRequest from(Intent intent, File filesDir, String nativeLibraryDir, String defaultBackend) {
String outputDir = readString(intent, "output_dir", new File(filesDir, "trace-replay").getAbsolutePath());
String diffPath = readString(intent, "diff_path", "");
return new TraceReplayRequest(
@@ -219,6 +225,7 @@ public final class TraceReplayActivity extends Activity {
intent.getIntExtra("crop_width", 0),
intent.getIntExtra("crop_height", 0),
intent.getIntExtra("fuzz_percent", 20),
readString(intent, "angle_library_dir", nativeLibraryDir),
intent.getBooleanExtra("use_angle", false)
);
}