diff --git a/.github/scripts/fetch-trace-fixture-lfs.sh b/.github/scripts/fetch-trace-fixture-lfs.sh index db8af394..0124157f 100644 --- a/.github/scripts/fetch-trace-fixture-lfs.sh +++ b/.github/scripts/fetch-trace-fixture-lfs.sh @@ -73,10 +73,10 @@ case "${case_name}" in add_standard_case "0000125124-linux-mesa" ;; minecraft-1.21.4-fabric-iris-iterationt-in-world) - add_standard_case "0001173280" + add_standard_case "0000110538" ;; minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world) - add_standard_case "0001606997" + add_standard_case "0000115019" ;; minecraft-1.21.4-fabric-iris-photon-v1.1-in-world) add_standard_case "0000159866" diff --git a/.github/workflows/apk.yml b/.github/workflows/apk.yml index 77ad8fd9..09fc1690 100644 --- a/.github/workflows/apk.yml +++ b/.github/workflows/apk.yml @@ -335,27 +335,27 @@ jobs: - name: minecraft-1.21.4-fabric-iris-iterationt-in-world trace_archive: tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.tgz trace_file: trace.trace - golden: tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.0001173280.png - target_call: 1173280 + golden: tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.0000110538.png + target_call: 110538 width: 854 height: 480 crop_x: 0 crop_y: 0 crop_width: 0 crop_height: 0 - timeout_seconds: 2400 + timeout_seconds: 900 - name: minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world trace_archive: tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.tgz trace_file: trace.trace - golden: tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.0001606997.png - target_call: 1606997 + golden: tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.0000115019.png + target_call: 115019 width: 854 height: 480 crop_x: 0 crop_y: 0 crop_width: 0 crop_height: 0 - timeout_seconds: 2400 + timeout_seconds: 900 - name: minecraft-1.21.4-fabric-iris-photon-v1.1-in-world trace_archive: tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-photon-v1.1-in-world.tgz trace_file: trace.trace diff --git a/tools/trace_replay/CMakeLists.txt b/tools/trace_replay/CMakeLists.txt index 4ff26c65..6826fda4 100644 --- a/tools/trace_replay/CMakeLists.txt +++ b/tools/trace_replay/CMakeLists.txt @@ -481,8 +481,8 @@ add_trace_replay_test_for_backends(minecraft-1.21.4-fabric-iris-chocapic-v6-lite add_trace_replay_test_for_backends(minecraft-1.21.4-fabric-iris-iterationt-in-world TRACE_ARCHIVE ${MOBILEGL_TRACE_ROOT}/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.tgz TRACE_FILE trace.trace - GOLDEN ${MOBILEGL_TRACE_ROOT}/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.0001173280.png - TARGET_CALL 1173280 + GOLDEN ${MOBILEGL_TRACE_ROOT}/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.0000110538.png + TARGET_CALL 110538 WIDTH 854 HEIGHT 480 ) @@ -490,8 +490,8 @@ add_trace_replay_test_for_backends(minecraft-1.21.4-fabric-iris-iterationt-in-wo add_trace_replay_test_for_backends(minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world TRACE_ARCHIVE ${MOBILEGL_TRACE_ROOT}/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.tgz TRACE_FILE trace.trace - GOLDEN ${MOBILEGL_TRACE_ROOT}/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.0001606997.png - TARGET_CALL 1606997 + GOLDEN ${MOBILEGL_TRACE_ROOT}/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.0000115019.png + TARGET_CALL 115019 WIDTH 854 HEIGHT 480 ) diff --git a/tools/trace_replay/README.md b/tools/trace_replay/README.md index ff6160e0..d5ce2338 100644 --- a/tools/trace_replay/README.md +++ b/tools/trace_replay/README.md @@ -45,10 +45,10 @@ The bundled fixtures cover: ![Minecraft 1.21.4 Fabric Iris Chocapic V6 Lite in-world golden](fixtures/minecraft-1.21.4-fabric-iris-chocapic-v6-lite-in-world.0000125124-linux-mesa.png) - minecraft-1.21.4-fabric-iris-iterationt-in-world: captured from Minecraft 1.21.4 Fabric with Sodium, Iris, and iterationT after entering a singleplayer world. - ![Minecraft 1.21.4 Fabric Iris iterationT in-world golden](fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.0001173280.png) + ![Minecraft 1.21.4 Fabric Iris iterationT in-world golden](fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.0000110538.png) - minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world: captured from Minecraft 1.21.4 Fabric with Sodium, Iris, and iterationT after entering a singleplayer world, with Iris' DSA path disabled. - ![Minecraft 1.21.4 Fabric Iris iterationT no-DSA in-world golden](fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.0001606997.png) + ![Minecraft 1.21.4 Fabric Iris iterationT no-DSA in-world golden](fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.0000115019.png) - minecraft-1.21.4-fabric-iris-photon-v1.1-in-world: captured from Minecraft 1.21.4 Fabric with Sodium, Iris, and Photon v1.1 after entering a singleplayer world. ![Minecraft 1.21.4 Fabric Iris Photon v1.1 in-world golden](fixtures/minecraft-1.21.4-fabric-iris-photon-v1.1-in-world.0000159866.png) diff --git a/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.0000110538.png b/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.0000110538.png new file mode 100644 index 00000000..1153f3dd --- /dev/null +++ b/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.0000110538.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4c995d70325c1fb7c5caa750a1400ca8b3ce15e3a9dbf73fe12c361db2f7647 +size 705968 diff --git a/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.0001173280.png b/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.0001173280.png deleted file mode 100644 index ea69d7b7..00000000 --- a/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.0001173280.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:903cf6f89b8f9e60581eeb2db2dd9c035cd34f8e05ac6cfc76cca3d1eafbeacf -size 738275 diff --git a/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.tgz b/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.tgz index b6acdd83..abc1791e 100644 --- a/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.tgz +++ b/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-in-world.tgz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95f0e5c081bd6596440d8777545e723cda55922dbbad7ac6aee9cc42f43a8128 -size 139656068 +oid sha256:4b3aedc0458819176f662700455ee3513d942d435bb803d9aa2b44abd23072d3 +size 78609429 diff --git a/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.0000115019.png b/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.0000115019.png new file mode 100644 index 00000000..03238285 --- /dev/null +++ b/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.0000115019.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89ba4d88428e81b73c35a6b46cb7937b421a1d69e3a64a2ea5d3773d59684c0a +size 800864 diff --git a/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.0001606997.png b/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.0001606997.png deleted file mode 100644 index dd52dfaa..00000000 --- a/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.0001606997.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b9cfa6c37ea1752db2d911d808e07c9dbffa2f7ff6453e3a85270b3a9bdb7c1 -size 739134 diff --git a/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.tgz b/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.tgz index b5e57c0b..7d653b75 100644 --- a/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.tgz +++ b/tools/trace_replay/fixtures/minecraft-1.21.4-fabric-iris-iterationt-nodsa-in-world.tgz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9db76ec3d50f76c35ebd6f8f5e21f47f6f29055c4c9c2c9113b9bce0d89be293 -size 136767983 +oid sha256:9d58cd7a91e1bc17f5f288f4008c6d2f058808ae7a8bd5bbd27c7b381e0c31c6 +size 78742403