mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-17 23:13:22 +09:00
[Feat] (Trace): the replay runner builds as an adb-shell executable for Android, and unix endpoints carry a headless window
MOBILEGL_BUILD_TRACE_REPLAY now also produces mobilegl_trace_replay on ANDROID: the same CLI as desktop, linked against the APK runner's glws/glproc glue. On the device it dials a render server with no Activity at all - MOBILEGL_IPC_CONTROL=unix:@name with shm data to the offscreen supervisor (a cross-uid abstract connect needs root or an SELinux waiver; loopback TCP works from plain adb shell), or tcp:// with MOBILEGL_IPC_SURFACE=server to the on-screen display server. glws_android grows the desktop glws_egl's server-owned null-window createWindowSurface, gated on MOBILEGL_TRACE_SURFACE=window so the APK's pbuffer mode keeps its old answer, and the config carries EGL_WINDOW_BIT for it. The control screen refuses unix endpoints in on-screen mode: the in-process display server serves tcp:// only. Verified on-device with an OpenRA retrace, ssim=1.0 both ways: offscreen service on @mgl-cli with the CLI as root, and the display Activity on tcp://127.0.0.1:40613 with the replay's frames on the phone's screen.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
cmake_minimum_required(VERSION 3.22.1)
|
||||
|
||||
if(NOT UNIX OR ANDROID)
|
||||
message(STATUS "MobileGL trace replay runner is only enabled on desktop Unix")
|
||||
if(NOT UNIX)
|
||||
message(STATUS "MobileGL trace replay runner is only enabled on Unix (Android included)")
|
||||
return()
|
||||
endif()
|
||||
|
||||
@@ -139,7 +139,9 @@ target_link_libraries(mobilegl_trace_common PUBLIC
|
||||
|
||||
add_library(mobilegl_trace_glproc STATIC
|
||||
"${APITRACE_GENERATED_DIR}/glproc.cpp"
|
||||
"${MOBILEGL_TRACE_ROOT}/apitrace_glproc_mobilegl.cpp")
|
||||
# Android resolves GL through the same loader glue as the APK runner; desktop
|
||||
# keeps its own.
|
||||
"$<IF:$<BOOL:${ANDROID}>,${MOBILEGL_TRACE_SHARED_CPP_DIR}/apitrace_glproc_android.cpp,${MOBILEGL_TRACE_ROOT}/apitrace_glproc_mobilegl.cpp>")
|
||||
if(APPLE)
|
||||
target_compile_definitions(mobilegl_trace_glproc PRIVATE GL_SILENCE_DEPRECATION)
|
||||
endif()
|
||||
@@ -225,7 +227,9 @@ add_library(mobilegl_trace_glretrace_common STATIC
|
||||
"${APITRACE_ROOT}/retrace/metric_helper.cpp"
|
||||
"${APITRACE_ROOT}/retrace/metric_writer.cpp"
|
||||
"${MOBILEGL_TRACE_ROOT}/apitrace_fbo_dump.cpp"
|
||||
"${MOBILEGL_TRACE_ROOT}/apitrace_glws_egl.cpp"
|
||||
# Android uses the APK runner's glws/glproc glue (pbuffer, or the server-owned
|
||||
# null-window surface for a headless replay); desktop uses the EGL one.
|
||||
"$<IF:$<BOOL:${ANDROID}>,${MOBILEGL_TRACE_SHARED_CPP_DIR}/apitrace_glws_android.cpp,${MOBILEGL_TRACE_ROOT}/apitrace_glws_egl.cpp>"
|
||||
"${MOBILEGL_TRACE_SHARED_CPP_DIR}/trace_benchmark.cpp")
|
||||
if(APPLE)
|
||||
set(MOBILEGL_TRACE_APPLE_FRAMEWORKS
|
||||
@@ -241,6 +245,7 @@ target_include_directories(mobilegl_trace_glretrace_common PUBLIC
|
||||
"${APITRACE_ROOT}/dispatch"
|
||||
"${APITRACE_ROOT}/helpers"
|
||||
"${APITRACE_ROOT}/retrace"
|
||||
"${MOBILEGL_TRACE_ROOT}"
|
||||
"${MOBILEGL_TRACE_SHARED_CPP_DIR}")
|
||||
target_compile_definitions(mobilegl_trace_glretrace_common PRIVATE
|
||||
exit=mobilegl_apitrace_exit
|
||||
@@ -280,6 +285,9 @@ else()
|
||||
${MOBILEGL_TRACE_REPLAY_LINK_LIBRARIES}
|
||||
"-Wl,--end-group")
|
||||
endif()
|
||||
if(ANDROID)
|
||||
target_link_libraries(mobilegl_trace_replay PRIVATE android log)
|
||||
endif()
|
||||
|
||||
# The `K=V;K=V` environment passthrough is the only hand-rolled parse between a CI flag
|
||||
# and setenv(), and the lane that exercises it end to end is an on-device retrace, which
|
||||
|
||||
Reference in New Issue
Block a user