Tests: Update Angry Birds 2 trace

Primarily fix the width/height of the drawing surface, but also pull in changes from July 2020 update. TBR: courtneygo@google.com,jmadill@chromium.org Test: angle_perftests --gtest_filter="*Trace*" Bug: b/157672184 Change-Id: Ia6e16f6d695954f50b3d2a4e8aaaa88514b461d1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2343453Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>

Tests: Update Angry Birds 2 trace
fc8866cf · Cody Northrop · Commit Bot · 1dcb3eb2 · fc8866cf · fc8866cf
Commit fc8866cf authored Aug 07, 2020 by Cody Northrop Committed by Commit Bot Aug 07, 2020
4 changed files
--- a/scripts/code_generation_hashes/restricted_traces.json
+++ b/scripts/code_generation_hashes/restricted_traces.json
 {
  "src/tests/perf_tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
-    "f289d1836514a3ced7c166186df43204",
+    "44fc5437c4a84012e338b3da4b6fc28a",
  "src/tests/perf_tests/restricted_traces/candy_crush_500.tar.gz.sha1":
    "ef00d8872fe818250df07f761d440bfb",
  "src/tests/perf_tests/restricted_traces/egypt_1500.tar.gz.sha1":
@@ -14,9 +14,9 @@
  "src/tests/perf_tests/restricted_traces/restricted_traces.json":
    "aefeb34167e491c2b869b7fe8c51e3ca",
  "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.cpp":
-    "f2f54a682b7d793e0d3a380a00d278e2",
+    "5f6fe67928fca1e6cb17f1b30e067500",
  "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni":
-    "7edfef5f418500f6092127065e3e894f",
+    "d950b3d89e1d80fc47a611863a76c18e",
  "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h":
    "961c4192564a6198c8114969baa32bb7",
  "src/tests/perf_tests/restricted_traces/subway_surfer_500.tar.gz.sha1":

--- a/src/tests/perf_tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1
+++ b/src/tests/perf_tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1
-125ca1b8163d4a7335abc7368a32607ec73c7b6b
\ No newline at end of file
+b1fbd6f0e94662be56cc0a937841c86daa6b057f
\ No newline at end of file
--- a/src/tests/perf_tests/restricted_traces/restricted_traces_autogen.cpp
+++ b/src/tests/perf_tests/restricted_traces/restricted_traces_autogen.cpp
@@ -11,7 +11,7 @@

 #include "common/PackedEnums.h"

-#include "angry_birds_2_1500/angry_birds_2_1500_capture_context3.h"
+#include "angry_birds_2_1500/angry_birds_2_1500_capture_context2.h"
 #include "candy_crush_500/candy_crush_500_capture_context2.h"
 #include "egypt_1500/egypt_1500_capture_context6.h"
 #include "manhattan_10/manhattan_10_capture_context6.h"
@@ -66,7 +66,7 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
    switch (traceID)
    {
        case RestrictedTraceID::angry_birds_2_1500:
-            angry_birds_2_1500::ReplayContext3Frame(frameIndex);
+            angry_birds_2_1500::ReplayContext2Frame(frameIndex);
            break;
        case RestrictedTraceID::candy_crush_500:
            candy_crush_500::ReplayContext2Frame(frameIndex);
@@ -101,7 +101,7 @@ void ResetReplay(RestrictedTraceID traceID)
    switch (traceID)
    {
        case RestrictedTraceID::angry_birds_2_1500:
-            angry_birds_2_1500::ResetContext3Replay();
+            angry_birds_2_1500::ResetContext2Replay();
            break;
        case RestrictedTraceID::candy_crush_500:
            candy_crush_500::ResetContext2Replay();
@@ -136,7 +136,7 @@ void SetupReplay(RestrictedTraceID traceID)
    switch (traceID)
    {
        case RestrictedTraceID::angry_birds_2_1500:
-            angry_birds_2_1500::SetupContext3Replay();
+            angry_birds_2_1500::SetupContext2Replay();
            break;
        case RestrictedTraceID::candy_crush_500:
            candy_crush_500::SetupContext2Replay();

--- a/src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni
+++ b/src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni
@@ -9,7 +9,7 @@
 # Can be consumed by tests/BUILD.gn.

 angle_restricted_traces = [
-  "angry_birds_2_1500 3",
+  "angry_birds_2_1500 2",
  "candy_crush_500 2",
  "egypt_1500 6",
  "manhattan_10 6",