diff --git a/.github/scripts/fetch-trace-fixture-lfs.sh b/.github/scripts/fetch-trace-fixture-lfs.sh index 88c1b726..be4bcd86 100644 --- a/.github/scripts/fetch-trace-fixture-lfs.sh +++ b/.github/scripts/fetch-trace-fixture-lfs.sh @@ -39,7 +39,7 @@ case "${case_name}" in add_standard_case "0000923340" ;; minecraft-26.2-main-menu) - add_standard_case "0000259766" + add_standard_case "0000101926" ;; minecraft-26.2-in-world) add_standard_case "0000519370" diff --git a/.github/workflows/apk.yml b/.github/workflows/apk.yml index 5b0465ef..3e3d1477 100644 --- a/.github/workflows/apk.yml +++ b/.github/workflows/apk.yml @@ -215,8 +215,8 @@ jobs: - name: minecraft-26.2-main-menu trace_archive: tools/trace_replay/fixtures/minecraft-26.2-main-menu.tgz trace_file: trace.trace - golden: tools/trace_replay/fixtures/minecraft-26.2-main-menu.0000259766.png - target_call: 259766 + golden: tools/trace_replay/fixtures/minecraft-26.2-main-menu.0000101926.png + target_call: 101926 width: 854 height: 480 crop_x: 0 diff --git a/tools/trace_replay/CMakeLists.txt b/tools/trace_replay/CMakeLists.txt index 5de0910c..163acb82 100644 --- a/tools/trace_replay/CMakeLists.txt +++ b/tools/trace_replay/CMakeLists.txt @@ -413,8 +413,8 @@ add_trace_replay_test_for_backends(minecraft-1.21.4-fabric-sodium-in-world add_trace_replay_test_for_backends(minecraft-26.2-main-menu TRACE_ARCHIVE ${MOBILEGL_TRACE_ROOT}/fixtures/minecraft-26.2-main-menu.tgz TRACE_FILE trace.trace - GOLDEN ${MOBILEGL_TRACE_ROOT}/fixtures/minecraft-26.2-main-menu.0000259766.png - TARGET_CALL 259766 + GOLDEN ${MOBILEGL_TRACE_ROOT}/fixtures/minecraft-26.2-main-menu.0000101926.png + TARGET_CALL 101926 WIDTH 854 HEIGHT 480 ) diff --git a/tools/trace_replay/README.md b/tools/trace_replay/README.md index f0f4c105..12817f1b 100644 --- a/tools/trace_replay/README.md +++ b/tools/trace_replay/README.md @@ -17,7 +17,7 @@ The bundled fixtures cover: singleplayer world with Fancy graphics. ![Minecraft 1.21.4 Fabric Sodium in-world golden](fixtures/minecraft-1.21.4-fabric-sodium-in-world.0000923340.png) - minecraft-26.2-main-menu: captured from Minecraft 26.2's main menu. - ![Minecraft 26.2 main menu golden](fixtures/minecraft-26.2-main-menu.0000259766.png) + ![Minecraft 26.2 main menu golden](fixtures/minecraft-26.2-main-menu.0000101926.png) - minecraft-26.2-in-world: captured from Minecraft 26.2 after entering a normal singleplayer world. ![Minecraft 26.2 in-world golden](fixtures/minecraft-26.2-in-world.0000519370.png) - minecraft-1.21.4-fabric-common-mods-in-world: captured from Minecraft 1.21.4 Fabric with Sodium, Iris, REI, diff --git a/tools/trace_replay/fixtures/minecraft-26.2-main-menu.0000101926.png b/tools/trace_replay/fixtures/minecraft-26.2-main-menu.0000101926.png new file mode 100644 index 00000000..5f7941a1 --- /dev/null +++ b/tools/trace_replay/fixtures/minecraft-26.2-main-menu.0000101926.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42f63ffc6709213baf65fc4cd8abb43d83da4f42272f55815f7351a9640a4f75 +size 316049 diff --git a/tools/trace_replay/fixtures/minecraft-26.2-main-menu.tgz b/tools/trace_replay/fixtures/minecraft-26.2-main-menu.tgz index 33883bca..ca5aafcd 100644 --- a/tools/trace_replay/fixtures/minecraft-26.2-main-menu.tgz +++ b/tools/trace_replay/fixtures/minecraft-26.2-main-menu.tgz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:804dc8cc22101826f31628b80e489f164c1ad7b9016cdda3325c9080c5b3584b -size 8833836 +oid sha256:0d00c9939a16c41ee32df655a6e15e8a2e5b89542602a5258f79156efe519f62 +size 6969357 diff --git a/tools/trace_replay/run_android_retrace_local.py b/tools/trace_replay/run_android_retrace_local.py index bb803212..c96bece9 100644 --- a/tools/trace_replay/run_android_retrace_local.py +++ b/tools/trace_replay/run_android_retrace_local.py @@ -48,7 +48,7 @@ CASES = [ {"name": "minecraft-1.21.4-main-menu", "golden": "minecraft-1.21.4-main-menu.0000481787.png", "alternate_golden": "minecraft-1.21.4-main-menu.0000481787-mali.png", "target_call": 481787, "timeout_seconds": 180}, {"name": "minecraft-1.21.4-in-world", "golden": "minecraft-1.21.4-in-world.0000280000.png", "target_call": 280000, "timeout_seconds": 900}, {"name": "minecraft-1.21.4-fabric-sodium-in-world", "golden": "minecraft-1.21.4-fabric-sodium-in-world.0000923340.png", "target_call": 923340, "timeout_seconds": 1800}, - {"name": "minecraft-26.2-main-menu", "golden": "minecraft-26.2-main-menu.0000259766.png", "target_call": 259766, "timeout_seconds": 180}, + {"name": "minecraft-26.2-main-menu", "golden": "minecraft-26.2-main-menu.0000101926.png", "target_call": 101926, "timeout_seconds": 180}, {"name": "minecraft-26.2-in-world", "golden": "minecraft-26.2-in-world.0000519370.png", "target_call": 519370, "timeout_seconds": 900}, {"name": "minecraft-1.21.4-fabric-common-mods-in-world", "golden": "minecraft-1.21.4-fabric-common-mods-in-world.0000522084.png", "target_call": 522084, "timeout_seconds": 1800}, {"name": "minecraft-1.21.4-fabric-common-mods-inventory", "golden": "minecraft-1.21.4-fabric-common-mods-inventory.0000728558.png", "target_call": 728558, "timeout_seconds": 1800},