Tests: Use context version from trace

Test: Capture and replay ES 3.2 apps
Bug: angleproject:5652
Change-Id: Ib46250acd8a50390f0cbd40853623cdf31bd0203
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2698392
Commit-Queue: Cody Northrop <cnorthrop@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Tim Van Patten <timvp@google.com>

scripts/code_generation_hashes/restricted_traces.json

@@ -40,7 +40,7 @@
   "src/tests/restricted_traces/free_fire.tar.gz.sha1":
     "a4e7aba54fb48524bb4f3022623bc7cd",
   "src/tests/restricted_traces/gen_restricted_traces.py":
-    "eccb9514e9606eb56b24cf57598e596c",
+    "7df2fbfb890d54ea9932b443439ae97e",
   "src/tests/restricted_traces/google_maps.tar.gz.sha1":
     "5d7001969619570e80e5a39b1ab8b0c4",
   "src/tests/restricted_traces/happy_color.tar.gz.sha1":
@@ -86,11 +86,11 @@
   "src/tests/restricted_traces/restricted_traces.json":
     "030dab939ec64fcdabdfbe6b05662e53",
   "src/tests/restricted_traces/restricted_traces_autogen.cpp":
-    "aea362cf1696f1014b8751c584748190",
+    "8c3d796ac3b9bafd3a84cb33a708706a",
   "src/tests/restricted_traces/restricted_traces_autogen.gni":
     "16b9118b91f903331c934c7b1786fe7f",
   "src/tests/restricted_traces/restricted_traces_autogen.h":
-    "d3e0d3469baea6837bcaae8a9d85a5d0",
+    "8eb2d7cf7be4d567a041e219e2192a18",
   "src/tests/restricted_traces/rise_of_kingdoms.tar.gz.sha1":
     "d4618f857c44f0dfa642ae3af8f161d9",
   "src/tests/restricted_traces/romancing_saga.tar.gz.sha1":

src/tests/perf_tests/TracePerfTest.cpp

@@ -34,9 +34,6 @@ struct TracePerfParams final : public RenderTestParams
     // Common default options
     TracePerfParams()
     {
-        majorVersion = 3;
-        minorVersion = 1;
-
         // Display the frame after every drawBenchmark invocation
         iterationsPerStep = 1;
     }
@@ -949,6 +946,8 @@ TracePerfParams CombineTestID(const TracePerfParams &in, RestrictedTraceID id)
 
     TracePerfParams out = in;
     out.testID          = id;
+    out.majorVersion    = traceInfo.contextClientMajorVersion;
+    out.minorVersion    = traceInfo.contextClientMinorVersion;
     out.windowWidth     = traceInfo.drawSurfaceWidth;
     out.windowHeight    = traceInfo.drawSurfaceHeight;
     return out;

src/tests/restricted_traces/gen_restricted_traces.py

@@ -97,8 +97,13 @@ using SetBinaryDataDirFunc = void (*)(const char *);
 
 static constexpr size_t kTraceInfoMaxNameLen = 32;
 
+static constexpr uint32_t kDefaultReplayContextClientMajorVersion = 3;
+static constexpr uint32_t kDefaultReplayContextClientMinorVersion = 1;
+
 struct TraceInfo
 {{
+    uint32_t contextClientMajorVersion;
+    uint32_t contextClientMinorVersion;
     uint32_t startFrame;
     uint32_t endFrame;
     uint32_t drawSurfaceWidth;
@@ -264,12 +269,32 @@ def gen_gni(traces, gni_file, format_args):
     return True
 
 
+def contains_context_version(trace):
+    "Determines if the trace contains the major/minor context version"
+    for file in os.listdir(trace):
+        if fnmatch.fnmatch(file, '*.h'):
+            with open(os.path.join(trace, file)) as f:
+                if 'kReplayContextClientMajorVersion' in f.read():
+                    return True
+    return False
+
+
 def get_trace_info(trace):
-    info = [
+    # Some traces don't contain major/minor version, so use defaults
+    info = []
+    defaults = ''
+    if contains_context_version(trace):
+        info += ["%s::kReplayContextClientMajorVersion", "%s::kReplayContextClientMinorVersion"]
+    else:
+        defaults = "kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,"
+
+    info += [
         "%s::kReplayFrameStart", "%s::kReplayFrameEnd", "%s::kReplayDrawSurfaceWidth",
         "%s::kReplayDrawSurfaceHeight", "\"%s\""
     ]
-    return ", ".join([element % trace for element in info])
+
+    merged_info = defaults + ", ".join([element % trace for element in info])
+    return merged_info
 
 
 def get_context(trace):

src/tests/restricted_traces/restricted_traces_autogen.cpp

@@ -71,200 +71,255 @@ namespace
 {
 constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
     {RestrictedTraceID::aliexpress,
-     {aliexpress::kReplayFrameStart, aliexpress::kReplayFrameEnd,
+     {aliexpress::kReplayContextClientMajorVersion, aliexpress::kReplayContextClientMinorVersion,
+      aliexpress::kReplayFrameStart, aliexpress::kReplayFrameEnd,
       aliexpress::kReplayDrawSurfaceWidth, aliexpress::kReplayDrawSurfaceHeight, "aliexpress"}},
     {RestrictedTraceID::angry_birds_2_1500,
-     {angry_birds_2_1500::kReplayFrameStart, angry_birds_2_1500::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      angry_birds_2_1500::kReplayFrameStart, angry_birds_2_1500::kReplayFrameEnd,
       angry_birds_2_1500::kReplayDrawSurfaceWidth, angry_birds_2_1500::kReplayDrawSurfaceHeight,
       "angry_birds_2_1500"}},
     {RestrictedTraceID::arena_of_valor,
-     {arena_of_valor::kReplayFrameStart, arena_of_valor::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      arena_of_valor::kReplayFrameStart, arena_of_valor::kReplayFrameEnd,
       arena_of_valor::kReplayDrawSurfaceWidth, arena_of_valor::kReplayDrawSurfaceHeight,
       "arena_of_valor"}},
     {RestrictedTraceID::asphalt_8,
-     {asphalt_8::kReplayFrameStart, asphalt_8::kReplayFrameEnd, asphalt_8::kReplayDrawSurfaceWidth,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      asphalt_8::kReplayFrameStart, asphalt_8::kReplayFrameEnd, asphalt_8::kReplayDrawSurfaceWidth,
       asphalt_8::kReplayDrawSurfaceHeight, "asphalt_8"}},
     {RestrictedTraceID::brawl_stars,
-     {brawl_stars::kReplayFrameStart, brawl_stars::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      brawl_stars::kReplayFrameStart, brawl_stars::kReplayFrameEnd,
       brawl_stars::kReplayDrawSurfaceWidth, brawl_stars::kReplayDrawSurfaceHeight, "brawl_stars"}},
     {RestrictedTraceID::bus_simulator_indonesia,
-     {bus_simulator_indonesia::kReplayFrameStart, bus_simulator_indonesia::kReplayFrameEnd,
+     {bus_simulator_indonesia::kReplayContextClientMajorVersion,
+      bus_simulator_indonesia::kReplayContextClientMinorVersion,
+      bus_simulator_indonesia::kReplayFrameStart, bus_simulator_indonesia::kReplayFrameEnd,
       bus_simulator_indonesia::kReplayDrawSurfaceWidth,
       bus_simulator_indonesia::kReplayDrawSurfaceHeight, "bus_simulator_indonesia"}},
     {RestrictedTraceID::candy_crush_500,
-     {candy_crush_500::kReplayFrameStart, candy_crush_500::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      candy_crush_500::kReplayFrameStart, candy_crush_500::kReplayFrameEnd,
       candy_crush_500::kReplayDrawSurfaceWidth, candy_crush_500::kReplayDrawSurfaceHeight,
       "candy_crush_500"}},
     {RestrictedTraceID::clash_of_clans,
-     {clash_of_clans::kReplayFrameStart, clash_of_clans::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      clash_of_clans::kReplayFrameStart, clash_of_clans::kReplayFrameEnd,
       clash_of_clans::kReplayDrawSurfaceWidth, clash_of_clans::kReplayDrawSurfaceHeight,
       "clash_of_clans"}},
     {RestrictedTraceID::clash_royale,
-     {clash_royale::kReplayFrameStart, clash_royale::kReplayFrameEnd,
-      clash_royale::kReplayDrawSurfaceWidth, clash_royale::kReplayDrawSurfaceHeight,
-      "clash_royale"}},
+     {clash_royale::kReplayContextClientMajorVersion,
+      clash_royale::kReplayContextClientMinorVersion, clash_royale::kReplayFrameStart,
+      clash_royale::kReplayFrameEnd, clash_royale::kReplayDrawSurfaceWidth,
+      clash_royale::kReplayDrawSurfaceHeight, "clash_royale"}},
     {RestrictedTraceID::cod_mobile,
-     {cod_mobile::kReplayFrameStart, cod_mobile::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      cod_mobile::kReplayFrameStart, cod_mobile::kReplayFrameEnd,
       cod_mobile::kReplayDrawSurfaceWidth, cod_mobile::kReplayDrawSurfaceHeight, "cod_mobile"}},
     {RestrictedTraceID::coin_master,
-     {coin_master::kReplayFrameStart, coin_master::kReplayFrameEnd,
+     {coin_master::kReplayContextClientMajorVersion, coin_master::kReplayContextClientMinorVersion,
+      coin_master::kReplayFrameStart, coin_master::kReplayFrameEnd,
       coin_master::kReplayDrawSurfaceWidth, coin_master::kReplayDrawSurfaceHeight, "coin_master"}},
     {RestrictedTraceID::dragon_ball_legends,
-     {dragon_ball_legends::kReplayFrameStart, dragon_ball_legends::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      dragon_ball_legends::kReplayFrameStart, dragon_ball_legends::kReplayFrameEnd,
       dragon_ball_legends::kReplayDrawSurfaceWidth, dragon_ball_legends::kReplayDrawSurfaceHeight,
       "dragon_ball_legends"}},
     {RestrictedTraceID::efootball_pes_2021,
-     {efootball_pes_2021::kReplayFrameStart, efootball_pes_2021::kReplayFrameEnd,
-      efootball_pes_2021::kReplayDrawSurfaceWidth, efootball_pes_2021::kReplayDrawSurfaceHeight,
-      "efootball_pes_2021"}},
+     {efootball_pes_2021::kReplayContextClientMajorVersion,
+      efootball_pes_2021::kReplayContextClientMinorVersion, efootball_pes_2021::kReplayFrameStart,
+      efootball_pes_2021::kReplayFrameEnd, efootball_pes_2021::kReplayDrawSurfaceWidth,
+      efootball_pes_2021::kReplayDrawSurfaceHeight, "efootball_pes_2021"}},
     {RestrictedTraceID::egypt_1500,
-     {egypt_1500::kReplayFrameStart, egypt_1500::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      egypt_1500::kReplayFrameStart, egypt_1500::kReplayFrameEnd,
       egypt_1500::kReplayDrawSurfaceWidth, egypt_1500::kReplayDrawSurfaceHeight, "egypt_1500"}},
     {RestrictedTraceID::eight_ball_pool,
-     {eight_ball_pool::kReplayFrameStart, eight_ball_pool::kReplayFrameEnd,
-      eight_ball_pool::kReplayDrawSurfaceWidth, eight_ball_pool::kReplayDrawSurfaceHeight,
-      "eight_ball_pool"}},
+     {eight_ball_pool::kReplayContextClientMajorVersion,
+      eight_ball_pool::kReplayContextClientMinorVersion, eight_ball_pool::kReplayFrameStart,
+      eight_ball_pool::kReplayFrameEnd, eight_ball_pool::kReplayDrawSurfaceWidth,
+      eight_ball_pool::kReplayDrawSurfaceHeight, "eight_ball_pool"}},
     {RestrictedTraceID::fallout_shelter_online,
-     {fallout_shelter_online::kReplayFrameStart, fallout_shelter_online::kReplayFrameEnd,
+     {fallout_shelter_online::kReplayContextClientMajorVersion,
+      fallout_shelter_online::kReplayContextClientMinorVersion,
+      fallout_shelter_online::kReplayFrameStart, fallout_shelter_online::kReplayFrameEnd,
       fallout_shelter_online::kReplayDrawSurfaceWidth,
       fallout_shelter_online::kReplayDrawSurfaceHeight, "fallout_shelter_online"}},
     {RestrictedTraceID::fate_grand_order,
-     {fate_grand_order::kReplayFrameStart, fate_grand_order::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      fate_grand_order::kReplayFrameStart, fate_grand_order::kReplayFrameEnd,
       fate_grand_order::kReplayDrawSurfaceWidth, fate_grand_order::kReplayDrawSurfaceHeight,
       "fate_grand_order"}},
     {RestrictedTraceID::fifa_mobile,
-     {fifa_mobile::kReplayFrameStart, fifa_mobile::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      fifa_mobile::kReplayFrameStart, fifa_mobile::kReplayFrameEnd,
       fifa_mobile::kReplayDrawSurfaceWidth, fifa_mobile::kReplayDrawSurfaceHeight, "fifa_mobile"}},
     {RestrictedTraceID::free_fire,
-     {free_fire::kReplayFrameStart, free_fire::kReplayFrameEnd, free_fire::kReplayDrawSurfaceWidth,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      free_fire::kReplayFrameStart, free_fire::kReplayFrameEnd, free_fire::kReplayDrawSurfaceWidth,
       free_fire::kReplayDrawSurfaceHeight, "free_fire"}},
     {RestrictedTraceID::google_maps,
-     {google_maps::kReplayFrameStart, google_maps::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      google_maps::kReplayFrameStart, google_maps::kReplayFrameEnd,
       google_maps::kReplayDrawSurfaceWidth, google_maps::kReplayDrawSurfaceHeight, "google_maps"}},
     {RestrictedTraceID::happy_color,
-     {happy_color::kReplayFrameStart, happy_color::kReplayFrameEnd,
+     {happy_color::kReplayContextClientMajorVersion, happy_color::kReplayContextClientMinorVersion,
+      happy_color::kReplayFrameStart, happy_color::kReplayFrameEnd,
       happy_color::kReplayDrawSurfaceWidth, happy_color::kReplayDrawSurfaceHeight, "happy_color"}},
     {RestrictedTraceID::hay_day,
-     {hay_day::kReplayFrameStart, hay_day::kReplayFrameEnd, hay_day::kReplayDrawSurfaceWidth,
+     {hay_day::kReplayContextClientMajorVersion, hay_day::kReplayContextClientMinorVersion,
+      hay_day::kReplayFrameStart, hay_day::kReplayFrameEnd, hay_day::kReplayDrawSurfaceWidth,
       hay_day::kReplayDrawSurfaceHeight, "hay_day"}},
     {RestrictedTraceID::hearthstone,
-     {hearthstone::kReplayFrameStart, hearthstone::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      hearthstone::kReplayFrameStart, hearthstone::kReplayFrameEnd,
       hearthstone::kReplayDrawSurfaceWidth, hearthstone::kReplayDrawSurfaceHeight, "hearthstone"}},
     {RestrictedTraceID::hill_climb_racing,
-     {hill_climb_racing::kReplayFrameStart, hill_climb_racing::kReplayFrameEnd,
-      hill_climb_racing::kReplayDrawSurfaceWidth, hill_climb_racing::kReplayDrawSurfaceHeight,
-      "hill_climb_racing"}},
+     {hill_climb_racing::kReplayContextClientMajorVersion,
+      hill_climb_racing::kReplayContextClientMinorVersion, hill_climb_racing::kReplayFrameStart,
+      hill_climb_racing::kReplayFrameEnd, hill_climb_racing::kReplayDrawSurfaceWidth,
+      hill_climb_racing::kReplayDrawSurfaceHeight, "hill_climb_racing"}},
     {RestrictedTraceID::kartrider_rush,
-     {kartrider_rush::kReplayFrameStart, kartrider_rush::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      kartrider_rush::kReplayFrameStart, kartrider_rush::kReplayFrameEnd,
       kartrider_rush::kReplayDrawSurfaceWidth, kartrider_rush::kReplayDrawSurfaceHeight,
       "kartrider_rush"}},
     {RestrictedTraceID::klondike_adventures,
-     {klondike_adventures::kReplayFrameStart, klondike_adventures::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      klondike_adventures::kReplayFrameStart, klondike_adventures::kReplayFrameEnd,
       klondike_adventures::kReplayDrawSurfaceWidth, klondike_adventures::kReplayDrawSurfaceHeight,
       "klondike_adventures"}},
     {RestrictedTraceID::lego_legacy,
-     {lego_legacy::kReplayFrameStart, lego_legacy::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      lego_legacy::kReplayFrameStart, lego_legacy::kReplayFrameEnd,
       lego_legacy::kReplayDrawSurfaceWidth, lego_legacy::kReplayDrawSurfaceHeight, "lego_legacy"}},
     {RestrictedTraceID::magic_tiles_3,
-     {magic_tiles_3::kReplayFrameStart, magic_tiles_3::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      magic_tiles_3::kReplayFrameStart, magic_tiles_3::kReplayFrameEnd,
       magic_tiles_3::kReplayDrawSurfaceWidth, magic_tiles_3::kReplayDrawSurfaceHeight,
       "magic_tiles_3"}},
     {RestrictedTraceID::manhattan_10,
-     {manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd,
       manhattan_10::kReplayDrawSurfaceWidth, manhattan_10::kReplayDrawSurfaceHeight,
       "manhattan_10"}},
     {RestrictedTraceID::manhattan_31,
-     {manhattan_31::kReplayFrameStart, manhattan_31::kReplayFrameEnd,
-      manhattan_31::kReplayDrawSurfaceWidth, manhattan_31::kReplayDrawSurfaceHeight,
-      "manhattan_31"}},
+     {manhattan_31::kReplayContextClientMajorVersion,
+      manhattan_31::kReplayContextClientMinorVersion, manhattan_31::kReplayFrameStart,
+      manhattan_31::kReplayFrameEnd, manhattan_31::kReplayDrawSurfaceWidth,
+      manhattan_31::kReplayDrawSurfaceHeight, "manhattan_31"}},
     {RestrictedTraceID::marvel_contest_of_champions,
-     {marvel_contest_of_champions::kReplayFrameStart, marvel_contest_of_champions::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      marvel_contest_of_champions::kReplayFrameStart, marvel_contest_of_champions::kReplayFrameEnd,
       marvel_contest_of_champions::kReplayDrawSurfaceWidth,
       marvel_contest_of_champions::kReplayDrawSurfaceHeight, "marvel_contest_of_champions"}},
     {RestrictedTraceID::messenger_lite,
-     {messenger_lite::kReplayFrameStart, messenger_lite::kReplayFrameEnd,
-      messenger_lite::kReplayDrawSurfaceWidth, messenger_lite::kReplayDrawSurfaceHeight,
-      "messenger_lite"}},
+     {messenger_lite::kReplayContextClientMajorVersion,
+      messenger_lite::kReplayContextClientMinorVersion, messenger_lite::kReplayFrameStart,
+      messenger_lite::kReplayFrameEnd, messenger_lite::kReplayDrawSurfaceWidth,
+      messenger_lite::kReplayDrawSurfaceHeight, "messenger_lite"}},
     {RestrictedTraceID::minecraft,
-     {minecraft::kReplayFrameStart, minecraft::kReplayFrameEnd, minecraft::kReplayDrawSurfaceWidth,
+     {minecraft::kReplayContextClientMajorVersion, minecraft::kReplayContextClientMinorVersion,
+      minecraft::kReplayFrameStart, minecraft::kReplayFrameEnd, minecraft::kReplayDrawSurfaceWidth,
       minecraft::kReplayDrawSurfaceHeight, "minecraft"}},
     {RestrictedTraceID::mobile_legends,
-     {mobile_legends::kReplayFrameStart, mobile_legends::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      mobile_legends::kReplayFrameStart, mobile_legends::kReplayFrameEnd,
       mobile_legends::kReplayDrawSurfaceWidth, mobile_legends::kReplayDrawSurfaceHeight,
       "mobile_legends"}},
     {RestrictedTraceID::nba2k20_800,
-     {nba2k20_800::kReplayFrameStart, nba2k20_800::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      nba2k20_800::kReplayFrameStart, nba2k20_800::kReplayFrameEnd,
       nba2k20_800::kReplayDrawSurfaceWidth, nba2k20_800::kReplayDrawSurfaceHeight, "nba2k20_800"}},
     {RestrictedTraceID::one_punch_man,
-     {one_punch_man::kReplayFrameStart, one_punch_man::kReplayFrameEnd,
-      one_punch_man::kReplayDrawSurfaceWidth, one_punch_man::kReplayDrawSurfaceHeight,
-      "one_punch_man"}},
+     {one_punch_man::kReplayContextClientMajorVersion,
+      one_punch_man::kReplayContextClientMinorVersion, one_punch_man::kReplayFrameStart,
+      one_punch_man::kReplayFrameEnd, one_punch_man::kReplayDrawSurfaceWidth,
+      one_punch_man::kReplayDrawSurfaceHeight, "one_punch_man"}},
     {RestrictedTraceID::pubg_mobile_lite,
-     {pubg_mobile_lite::kReplayFrameStart, pubg_mobile_lite::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      pubg_mobile_lite::kReplayFrameStart, pubg_mobile_lite::kReplayFrameEnd,
       pubg_mobile_lite::kReplayDrawSurfaceWidth, pubg_mobile_lite::kReplayDrawSurfaceHeight,
       "pubg_mobile_lite"}},
     {RestrictedTraceID::raid_shadow_legends,
-     {raid_shadow_legends::kReplayFrameStart, raid_shadow_legends::kReplayFrameEnd,
-      raid_shadow_legends::kReplayDrawSurfaceWidth, raid_shadow_legends::kReplayDrawSurfaceHeight,
-      "raid_shadow_legends"}},
+     {raid_shadow_legends::kReplayContextClientMajorVersion,
+      raid_shadow_legends::kReplayContextClientMinorVersion, raid_shadow_legends::kReplayFrameStart,
+      raid_shadow_legends::kReplayFrameEnd, raid_shadow_legends::kReplayDrawSurfaceWidth,
+      raid_shadow_legends::kReplayDrawSurfaceHeight, "raid_shadow_legends"}},
     {RestrictedTraceID::real_commando_secret_mission,
-     {real_commando_secret_mission::kReplayFrameStart,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      real_commando_secret_mission::kReplayFrameStart,
       real_commando_secret_mission::kReplayFrameEnd,
       real_commando_secret_mission::kReplayDrawSurfaceWidth,
       real_commando_secret_mission::kReplayDrawSurfaceHeight, "real_commando_secret_mission"}},
     {RestrictedTraceID::real_gangster_crime,
-     {real_gangster_crime::kReplayFrameStart, real_gangster_crime::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      real_gangster_crime::kReplayFrameStart, real_gangster_crime::kReplayFrameEnd,
       real_gangster_crime::kReplayDrawSurfaceWidth, real_gangster_crime::kReplayDrawSurfaceHeight,
       "real_gangster_crime"}},
     {RestrictedTraceID::rise_of_kingdoms,
-     {rise_of_kingdoms::kReplayFrameStart, rise_of_kingdoms::kReplayFrameEnd,
-      rise_of_kingdoms::kReplayDrawSurfaceWidth, rise_of_kingdoms::kReplayDrawSurfaceHeight,
-      "rise_of_kingdoms"}},
+     {rise_of_kingdoms::kReplayContextClientMajorVersion,
+      rise_of_kingdoms::kReplayContextClientMinorVersion, rise_of_kingdoms::kReplayFrameStart,
+      rise_of_kingdoms::kReplayFrameEnd, rise_of_kingdoms::kReplayDrawSurfaceWidth,
+      rise_of_kingdoms::kReplayDrawSurfaceHeight, "rise_of_kingdoms"}},
     {RestrictedTraceID::romancing_saga,
-     {romancing_saga::kReplayFrameStart, romancing_saga::kReplayFrameEnd,
-      romancing_saga::kReplayDrawSurfaceWidth, romancing_saga::kReplayDrawSurfaceHeight,
-      "romancing_saga"}},
+     {romancing_saga::kReplayContextClientMajorVersion,
+      romancing_saga::kReplayContextClientMinorVersion, romancing_saga::kReplayFrameStart,
+      romancing_saga::kReplayFrameEnd, romancing_saga::kReplayDrawSurfaceWidth,
+      romancing_saga::kReplayDrawSurfaceHeight, "romancing_saga"}},
     {RestrictedTraceID::saint_seiya_awakening,
-     {saint_seiya_awakening::kReplayFrameStart, saint_seiya_awakening::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      saint_seiya_awakening::kReplayFrameStart, saint_seiya_awakening::kReplayFrameEnd,
       saint_seiya_awakening::kReplayDrawSurfaceWidth,
       saint_seiya_awakening::kReplayDrawSurfaceHeight, "saint_seiya_awakening"}},
     {RestrictedTraceID::shadow_fight_2,
-     {shadow_fight_2::kReplayFrameStart, shadow_fight_2::kReplayFrameEnd,
-      shadow_fight_2::kReplayDrawSurfaceWidth, shadow_fight_2::kReplayDrawSurfaceHeight,
-      "shadow_fight_2"}},
+     {shadow_fight_2::kReplayContextClientMajorVersion,
+      shadow_fight_2::kReplayContextClientMinorVersion, shadow_fight_2::kReplayFrameStart,
+      shadow_fight_2::kReplayFrameEnd, shadow_fight_2::kReplayDrawSurfaceWidth,
+      shadow_fight_2::kReplayDrawSurfaceHeight, "shadow_fight_2"}},
     {RestrictedTraceID::sniper_3d,
-     {sniper_3d::kReplayFrameStart, sniper_3d::kReplayFrameEnd, sniper_3d::kReplayDrawSurfaceWidth,
+     {sniper_3d::kReplayContextClientMajorVersion, sniper_3d::kReplayContextClientMinorVersion,
+      sniper_3d::kReplayFrameStart, sniper_3d::kReplayFrameEnd, sniper_3d::kReplayDrawSurfaceWidth,
       sniper_3d::kReplayDrawSurfaceHeight, "sniper_3d"}},
     {RestrictedTraceID::subway_surfers,
-     {subway_surfers::kReplayFrameStart, subway_surfers::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      subway_surfers::kReplayFrameStart, subway_surfers::kReplayFrameEnd,
       subway_surfers::kReplayDrawSurfaceWidth, subway_surfers::kReplayDrawSurfaceHeight,
       "subway_surfers"}},
     {RestrictedTraceID::temple_run_2,
-     {temple_run_2::kReplayFrameStart, temple_run_2::kReplayFrameEnd,
-      temple_run_2::kReplayDrawSurfaceWidth, temple_run_2::kReplayDrawSurfaceHeight,
-      "temple_run_2"}},
+     {temple_run_2::kReplayContextClientMajorVersion,
+      temple_run_2::kReplayContextClientMinorVersion, temple_run_2::kReplayFrameStart,
+      temple_run_2::kReplayFrameEnd, temple_run_2::kReplayDrawSurfaceWidth,
+      temple_run_2::kReplayDrawSurfaceHeight, "temple_run_2"}},
     {RestrictedTraceID::temple_run_300,
-     {temple_run_300::kReplayFrameStart, temple_run_300::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      temple_run_300::kReplayFrameStart, temple_run_300::kReplayFrameEnd,
       temple_run_300::kReplayDrawSurfaceWidth, temple_run_300::kReplayDrawSurfaceHeight,
       "temple_run_300"}},
     {RestrictedTraceID::trex_200,
-     {trex_200::kReplayFrameStart, trex_200::kReplayFrameEnd, trex_200::kReplayDrawSurfaceWidth,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      trex_200::kReplayFrameStart, trex_200::kReplayFrameEnd, trex_200::kReplayDrawSurfaceWidth,
       trex_200::kReplayDrawSurfaceHeight, "trex_200"}},
     {RestrictedTraceID::whatsapp,
-     {whatsapp::kReplayFrameStart, whatsapp::kReplayFrameEnd, whatsapp::kReplayDrawSurfaceWidth,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      whatsapp::kReplayFrameStart, whatsapp::kReplayFrameEnd, whatsapp::kReplayDrawSurfaceWidth,
       whatsapp::kReplayDrawSurfaceHeight, "whatsapp"}},
     {RestrictedTraceID::world_of_tanks_blitz,
-     {world_of_tanks_blitz::kReplayFrameStart, world_of_tanks_blitz::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      world_of_tanks_blitz::kReplayFrameStart, world_of_tanks_blitz::kReplayFrameEnd,
       world_of_tanks_blitz::kReplayDrawSurfaceWidth, world_of_tanks_blitz::kReplayDrawSurfaceHeight,
       "world_of_tanks_blitz"}},
     {RestrictedTraceID::world_war_doh,
-     {world_war_doh::kReplayFrameStart, world_war_doh::kReplayFrameEnd,
+     {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
+      world_war_doh::kReplayFrameStart, world_war_doh::kReplayFrameEnd,
       world_war_doh::kReplayDrawSurfaceWidth, world_war_doh::kReplayDrawSurfaceHeight,
       "world_war_doh"}},
     {RestrictedTraceID::worms_zone_io,
-     {worms_zone_io::kReplayFrameStart, worms_zone_io::kReplayFrameEnd,
-      worms_zone_io::kReplayDrawSurfaceWidth, worms_zone_io::kReplayDrawSurfaceHeight,
-      "worms_zone_io"}}};
+     {worms_zone_io::kReplayContextClientMajorVersion,
+      worms_zone_io::kReplayContextClientMinorVersion, worms_zone_io::kReplayFrameStart,
+      worms_zone_io::kReplayFrameEnd, worms_zone_io::kReplayDrawSurfaceWidth,
+      worms_zone_io::kReplayDrawSurfaceHeight, "worms_zone_io"}}};
 }
 
 const TraceInfo &GetTraceInfo(RestrictedTraceID traceID)

src/tests/restricted_traces/restricted_traces_autogen.h

@@ -119,8 +119,13 @@ using SetBinaryDataDirFunc = void (*)(const char *);
 
 static constexpr size_t kTraceInfoMaxNameLen = 32;
 
+static constexpr uint32_t kDefaultReplayContextClientMajorVersion = 3;
+static constexpr uint32_t kDefaultReplayContextClientMinorVersion = 1;
+
 struct TraceInfo
 {
+    uint32_t contextClientMajorVersion;
+    uint32_t contextClientMinorVersion;
     uint32_t startFrame;
     uint32_t endFrame;
     uint32_t drawSurfaceWidth;