From 9ad0d4835dbd0d9bb023a874cd652a80256ffd6e Mon Sep 17 00:00:00 2001 From: Swung0x48 Date: Sun, 18 Oct 2026 07:59:29 -0400 Subject: [PATCH] [Refactor] (android-plugin/app, MobileGL): delete the unread MOBILEGL_TRACE_SKIP_AUTODESTROY knob --- MobileGL/Config.h | 2 -- MobileGL/ConfigLoader.cpp | 1 - android-plugin/app/src/trace/cpp/trace_replay_core.cpp | 1 - 3 files changed, 4 deletions(-) diff --git a/MobileGL/Config.h b/MobileGL/Config.h index 02e9cead..7fb93ae4 100644 --- a/MobileGL/Config.h +++ b/MobileGL/Config.h @@ -244,8 +244,6 @@ namespace MobileGL::MG_Config { // flush calls on rewritten maps become error-free no-ops. Non-persistent maps // keep spec FLUSH_EXPLICIT behavior. Bool CoherentAsFlush = false; - // MOBILEGL_TRACE_SKIP_AUTODESTROY: skip teardown in the ELF destructor (Init.cpp). - Bool TraceSkipAutodestroy = false; // MOBILEGL_ESPRYT_DISABLE_UBO_RING: force the DirectGLES global-UBO upload back to the // per-draw glBufferSubData path instead of the persistent-mapped ring allocator // (negative control / driver-bug escape hatch). diff --git a/MobileGL/ConfigLoader.cpp b/MobileGL/ConfigLoader.cpp index df05e2e8..6b42d86e 100644 --- a/MobileGL/ConfigLoader.cpp +++ b/MobileGL/ConfigLoader.cpp @@ -403,7 +403,6 @@ namespace MobileGL::MG_ConfigLoader { features.EsprytInvalidImagePlaceholder = QueryEnvQuirkOverride("MOBILEGL_ESPRYT_INVALID_IMAGE_PLACEHOLDER"); features.PointSizeDemotion = QueryEnvQuirkOverride("MOBILEGL_POINT_SIZE_DEMOTION"); features.CoherentAsFlush = QueryEnvFlag("MOBILEGL_COHERENT_AS_FLUSH"); - features.TraceSkipAutodestroy = QueryEnvFlag("MOBILEGL_TRACE_SKIP_AUTODESTROY"); features.EsprytDisableUboRing = QueryEnvFlag("MOBILEGL_ESPRYT_DISABLE_UBO_RING"); features.EsprytDisableUnpackRing = QueryEnvFlag("MOBILEGL_ESPRYT_DISABLE_UNPACK_RING"); features.EsprytDisableUploadRing = QueryEnvFlag("MOBILEGL_ESPRYT_DISABLE_UPLOAD_RING"); diff --git a/android-plugin/app/src/trace/cpp/trace_replay_core.cpp b/android-plugin/app/src/trace/cpp/trace_replay_core.cpp index 5939fd20..818c341e 100644 --- a/android-plugin/app/src/trace/cpp/trace_replay_core.cpp +++ b/android-plugin/app/src/trace/cpp/trace_replay_core.cpp @@ -160,7 +160,6 @@ void ApplyEnvOverrides(const std::vector& entries) { bool LoadMobileGL(const Request& request, std::string& error) { setenv("MOBILEGL_BACKEND_TYPE", request.backend.c_str(), 1); setenv("MOBILEGL_TRACE_LIBRARY", request.mobileGlLibrary.c_str(), 1); - setenv("MOBILEGL_TRACE_SKIP_AUTODESTROY", "1", 1); // Retrace is a test lane on every platform, including the Android AVD one where // MobileGL's __ANDROID__ default would leave validation off. No overwrite: an outer // MOBILEGL_VALIDATE_SPIRV=0 must keep working as the escape hatch, and retracing the