[Fix] (trace-replay): stabilize ANGLE retrace cases

This commit is contained in:
2026-07-08 01:07:20 +08:00
parent 292576d2a1
commit 83d475eb02
7 changed files with 92 additions and 12 deletions
@@ -149,6 +149,11 @@ bool LoadMobileGL(const Request& request, std::string& error) {
unsetenv("MOBILEGL_RETRACE_USE_ANGLE");
unsetenv("MOBILEGL_RETRACE_ANGLE_DIR");
}
if (request.avoidAngleLlvmpipeSamplerMipmapMinFilter) {
setenv("MOBILEGL_ANGLE_LLVMPIPE_AVOID_SAMPLER_MIPMAP_MIN_FILTER", "1", 1);
} else {
unsetenv("MOBILEGL_ANGLE_LLVMPIPE_AVOID_SAMPLER_MIPMAP_MIN_FILTER");
}
void* handle = dlopen(request.mobileGlLibrary.c_str(), RTLD_NOW | RTLD_GLOBAL);
if (handle == nullptr) {
@@ -870,6 +875,8 @@ bool WriteResultJson(const Request& request, const Result& result) {
file << " \"ssimThreshold\": " << request.ssimThreshold << ",\n";
file << " \"useAngle\": " << (UseAngleForRequest(request) ? "true" : "false") << ",\n";
file << " \"usePbuffer\": " << (request.usePbuffer ? "true" : "false") << ",\n";
file << " \"avoidAngleLlvmpipeSamplerMipmapMinFilter\": "
<< (request.avoidAngleLlvmpipeSamplerMipmapMinFilter ? "true" : "false") << ",\n";
file << " \"holdMs\": " << request.holdMs << ",\n";
file << " \"mismatchPixels\": " << result.mismatchPixels << "\n";
file << "}\n";
@@ -35,6 +35,7 @@ struct Request {
double ssimThreshold = 0.99;
bool useAngle = false;
bool usePbuffer = true;
bool avoidAngleLlvmpipeSamplerMipmapMinFilter = false;
int holdMs = 0;
};
@@ -100,7 +100,8 @@ Java_top_mobilegl_plugin_trace_TraceReplayActivity_nativeRunTraceReplay(JNIEnv*
jint cropHeight,
jstring angleLibraryDir,
jboolean useAngle,
jboolean usePbuffer) {
jboolean usePbuffer,
jboolean avoidAngleLlvmpipeSamplerMipmapMinFilter) {
mobilegl_trace::Request request;
request.tracePath = ToString(env, tracePath);
request.goldenPath = ToString(env, goldenPath);
@@ -123,6 +124,8 @@ Java_top_mobilegl_plugin_trace_TraceReplayActivity_nativeRunTraceReplay(JNIEnv*
request.cropHeight = cropHeight;
request.useAngle = useAngle == JNI_TRUE;
request.usePbuffer = usePbuffer == JNI_TRUE;
request.avoidAngleLlvmpipeSamplerMipmapMinFilter =
avoidAngleLlvmpipeSamplerMipmapMinFilter == JNI_TRUE;
ScopedTraceReplayState replayState;
mobilegl_trace_set_requested_size(request.width, request.height);
@@ -113,7 +113,8 @@ public final class TraceReplayActivity extends Activity {
request.cropHeight,
request.angleLibraryDir,
request.useAngle,
request.usePbuffer
request.usePbuffer,
request.avoidAngleLlvmpipeSamplerMipmapMinFilter
);
Log.i(TAG, result.toString());
TraceReplayResult finalResult = result;
@@ -142,7 +143,8 @@ public final class TraceReplayActivity extends Activity {
int cropHeight,
String angleLibraryDir,
boolean useAngle,
boolean usePbuffer
boolean usePbuffer,
boolean avoidAngleLlvmpipeSamplerMipmapMinFilter
);
private static final class TraceReplayRequest {
@@ -164,6 +166,7 @@ public final class TraceReplayActivity extends Activity {
final String angleLibraryDir;
final boolean useAngle;
final boolean usePbuffer;
final boolean avoidAngleLlvmpipeSamplerMipmapMinFilter;
private TraceReplayRequest(
String tracePath,
@@ -183,7 +186,8 @@ public final class TraceReplayActivity extends Activity {
int cropHeight,
String angleLibraryDir,
boolean useAngle,
boolean usePbuffer
boolean usePbuffer,
boolean avoidAngleLlvmpipeSamplerMipmapMinFilter
) {
this.tracePath = tracePath;
this.goldenPath = goldenPath;
@@ -203,6 +207,7 @@ public final class TraceReplayActivity extends Activity {
this.angleLibraryDir = angleLibraryDir;
this.useAngle = useAngle;
this.usePbuffer = usePbuffer;
this.avoidAngleLlvmpipeSamplerMipmapMinFilter = avoidAngleLlvmpipeSamplerMipmapMinFilter;
}
static TraceReplayRequest from(Intent intent, File filesDir, String nativeLibraryDir, String defaultBackend) {
@@ -226,7 +231,8 @@ public final class TraceReplayActivity extends Activity {
intent.getIntExtra("crop_height", 0),
readString(intent, "angle_library_dir", nativeLibraryDir),
intent.getBooleanExtra("use_angle", false),
intent.getBooleanExtra("use_pbuffer", false)
intent.getBooleanExtra("use_pbuffer", false),
intent.getBooleanExtra("avoid_angle_llvmpipe_sampler_mipmap_min_filter", false)
);
}