diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..f2c1b7da --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +tools/trace_replay/fixtures/*.tgz filter=lfs diff=lfs merge=lfs -text +tools/trace_replay/fixtures/*.png filter=lfs diff=lfs merge=lfs -text diff --git a/.github/workflows/apk.yml b/.github/workflows/apk.yml index 0d90ab6b..6757f51f 100644 --- a/.github/workflows/apk.yml +++ b/.github/workflows/apk.yml @@ -208,8 +208,8 @@ jobs: --case minecraft-1.21.4-in-world --trace-archive tools/trace_replay/fixtures/minecraft-1.21.4-in-world.tgz --trace-file trace.trace - --golden tools/trace_replay/fixtures/minecraft-1.21.4-in-world.0004000686.png - --target-call 4000686 + --golden tools/trace_replay/fixtures/minecraft-1.21.4-in-world.0000280000.png + --target-call 280000 --width 854 --height 480 --tolerance 500 @@ -310,8 +310,8 @@ jobs: --case minecraft-1.21.4-in-world --trace-archive tools/trace_replay/fixtures/minecraft-1.21.4-in-world.tgz --trace-file trace.trace - --golden tools/trace_replay/fixtures/minecraft-1.21.4-in-world.0004000686.png - --target-call 4000686 + --golden tools/trace_replay/fixtures/minecraft-1.21.4-in-world.0000280000.png + --target-call 280000 --width 854 --height 480 --tolerance 500 diff --git a/tools/trace_replay/CMakeLists.txt b/tools/trace_replay/CMakeLists.txt index 6d9bb7be..4a9bf885 100644 --- a/tools/trace_replay/CMakeLists.txt +++ b/tools/trace_replay/CMakeLists.txt @@ -379,8 +379,8 @@ add_trace_replay_test_for_backends(minecraft-1.21.4-main-menu add_trace_replay_test_for_backends(minecraft-1.21.4-in-world TRACE_ARCHIVE ${MOBILEGL_TRACE_ROOT}/fixtures/minecraft-1.21.4-in-world.tgz TRACE_FILE trace.trace - GOLDEN ${MOBILEGL_TRACE_ROOT}/fixtures/minecraft-1.21.4-in-world.0004000686.png - TARGET_CALL 4000686 + GOLDEN ${MOBILEGL_TRACE_ROOT}/fixtures/minecraft-1.21.4-in-world.0000280000.png + TARGET_CALL 280000 WIDTH 854 HEIGHT 480 TOLERANCE 500 diff --git a/tools/trace_replay/README.md b/tools/trace_replay/README.md index b10e8107..9e3fca1b 100644 --- a/tools/trace_replay/README.md +++ b/tools/trace_replay/README.md @@ -12,7 +12,7 @@ The bundled fixtures cover: - minecraft-1.21.4-main-menu: captured from Minecraft 1.21.4's main menu. ![Minecraft 1.21.4 main menu golden](fixtures/minecraft-1.21.4-main-menu.0000481787.png) - minecraft-1.21.4-in-world: captured from Minecraft 1.21.4 after entering a singleplayer world. - ![Minecraft 1.21.4 in-world golden](fixtures/minecraft-1.21.4-in-world.0004000686.png) + ![Minecraft 1.21.4 in-world golden](fixtures/minecraft-1.21.4-in-world.0000280000.png) Build from the MobileGL repository root: diff --git a/tools/trace_replay/fixtures/minecraft-1.21.4-in-world.0000280000.png b/tools/trace_replay/fixtures/minecraft-1.21.4-in-world.0000280000.png new file mode 100644 index 00000000..864e696a --- /dev/null +++ b/tools/trace_replay/fixtures/minecraft-1.21.4-in-world.0000280000.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6bc1f2673b58ac4bcc80ab732098d548a43bb5f22dabe2f5cb3e0fb31d44979 +size 296445 diff --git a/tools/trace_replay/fixtures/minecraft-1.21.4-in-world.0004000686.png b/tools/trace_replay/fixtures/minecraft-1.21.4-in-world.0004000686.png deleted file mode 100644 index eba6a569..00000000 Binary files a/tools/trace_replay/fixtures/minecraft-1.21.4-in-world.0004000686.png and /dev/null differ diff --git a/tools/trace_replay/fixtures/minecraft-1.21.4-in-world.tgz b/tools/trace_replay/fixtures/minecraft-1.21.4-in-world.tgz index 1d8eb3b8..36698f00 100644 Binary files a/tools/trace_replay/fixtures/minecraft-1.21.4-in-world.tgz and b/tools/trace_replay/fixtures/minecraft-1.21.4-in-world.tgz differ diff --git a/tools/trace_replay/fixtures/minecraft-1.21.4-main-menu.0000481787.png b/tools/trace_replay/fixtures/minecraft-1.21.4-main-menu.0000481787.png index 9b3c60bd..4e0ceeb0 100644 Binary files a/tools/trace_replay/fixtures/minecraft-1.21.4-main-menu.0000481787.png and b/tools/trace_replay/fixtures/minecraft-1.21.4-main-menu.0000481787.png differ diff --git a/tools/trace_replay/fixtures/minecraft-1.21.4-main-menu.tgz b/tools/trace_replay/fixtures/minecraft-1.21.4-main-menu.tgz index 6110a8b8..f6caff5c 100644 Binary files a/tools/trace_replay/fixtures/minecraft-1.21.4-main-menu.tgz and b/tools/trace_replay/fixtures/minecraft-1.21.4-main-menu.tgz differ diff --git a/tools/trace_replay/fixtures/minecraft-1.21.4-startup.0000092195.png b/tools/trace_replay/fixtures/minecraft-1.21.4-startup.0000092195.png index f00da5ba..3e849651 100644 Binary files a/tools/trace_replay/fixtures/minecraft-1.21.4-startup.0000092195.png and b/tools/trace_replay/fixtures/minecraft-1.21.4-startup.0000092195.png differ diff --git a/tools/trace_replay/fixtures/minecraft-1.21.4-startup.tgz b/tools/trace_replay/fixtures/minecraft-1.21.4-startup.tgz index e533edbf..26746c79 100644 Binary files a/tools/trace_replay/fixtures/minecraft-1.21.4-startup.tgz and b/tools/trace_replay/fixtures/minecraft-1.21.4-startup.tgz differ diff --git a/tools/trace_replay/fixtures/openra.0000031249.png b/tools/trace_replay/fixtures/openra.0000031249.png index a4099d8b..aed15b63 100644 Binary files a/tools/trace_replay/fixtures/openra.0000031249.png and b/tools/trace_replay/fixtures/openra.0000031249.png differ diff --git a/tools/trace_replay/fixtures/openra.tgz b/tools/trace_replay/fixtures/openra.tgz index 1179ba1a..992158a6 100644 Binary files a/tools/trace_replay/fixtures/openra.tgz and b/tools/trace_replay/fixtures/openra.tgz differ