Tests: Add MARVEL Strike Force trace

Test: angle_perftests --gtest_filter="*marvel_strike_force*"
Bug: angleproject:7005
Change-Id: Ife9c6f303651bc746953e0ecfc529a2c9ec0b0d7
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3457744
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Cody Northrop <cnorthrop@google.com>

DEPS

@@ -1336,6 +1336,16 @@ deps = {
       'dep_type': 'cipd',
       'condition': 'checkout_angle_restricted_traces',
   },
+  'src/tests/restricted_traces/marvel_strike_force': {
+      'packages': [
+        {
+            'package': 'angle/traces/marvel_strike_force',
+            'version': 'version:1',
+        },
+      ],
+      'dep_type': 'cipd',
+      'condition': 'checkout_angle_restricted_traces',
+  },
   'src/tests/restricted_traces/messenger_lite': {
       'packages': [
         {

scripts/code_generation_hashes/restricted_traces.json

@@ -4,5 +4,5 @@
   "src/tests/restricted_traces/gen_restricted_traces.py":
     "7780405f8e0d92fa87a772dd64c62efb",
   "src/tests/restricted_traces/restricted_traces.json":
-    "7d20a3b6560b46d379d5d9e58a66b019"
+    "22713c633cb291267c59c3e0bff261ca"
 }

src/tests/perf_tests/TracePerfTest.cpp

@@ -1181,6 +1181,16 @@ TracePerfTest::TracePerfTest(const TracePerfParams &params)
         addExtensionPrerequisite("GL_EXT_texture_storage");
     }
 
+    if (traceNameIs("marvel_strike_force"))
+    {
+        // http://anglebug.com/7017 - Qualcomm native driver gets confused about the state of a
+        // buffer that was recreated during the trace
+        if ((IsAndroid() && IsQualcomm()) && mParams.driver != GLESDriverType::AngleEGL)
+        {
+            mSkipTest = true;
+        }
+    }
+
     ASSERT(mParams.surfaceType == SurfaceType::Window || gEnableAllTraceTests);
     ASSERT(mParams.eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE ||
            gEnableAllTraceTests);

src/tests/restricted_traces/restricted_traces.json

@@ -77,6 +77,7 @@
     "manhattan_31 5",
     "mario_kart_tour 5",
     "marvel_contest_of_champions 5",
+    "marvel_strike_force 1",
     "messenger_lite 5",
     "minecraft 5",
     "mini_world 5",