Revert "Capture/Replay: Update traces to include Reset"

scripts/code_generation_hashes/restricted_traces.json

 {
   "src/tests/perf_tests/restricted_traces/gen_restricted_traces.py":
-    "fc94f7c9564851007a2cc948ec294763",
+    "9cd5b4fa06f8d53fc7ae5ce3059efeaa",
   "src/tests/perf_tests/restricted_traces/restricted_traces.json":
-    "2ec0b24146fae188133760e75ed3c2a7",
+    "b73081e6815268e7712599d83f4bfb7c",
   "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni":
-    "03132a8daefaad262bb235e3752cea32",
+    "00afbfd7987ff25af045af104477a680",
   "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h":
-    "bd774aa39eccb200671a7ee7a95151a5"
+    "d0b8cfda99009a6e042989ffa0ea3608"
 }
\ No newline at end of file

src/tests/perf_tests/TracePerfTest.cpp

@@ -188,8 +188,6 @@ void TracePerfTest::drawBenchmark()
         endInternalTraceEvent(frameName);
     }
 
-    ResetReplay(GetParam().testID);
-
     // Process any running queries once per iteration.
     for (size_t queryIndex = 0; queryIndex < mRunningQueries.size();)
     {

src/tests/perf_tests/restricted_traces/gen_restricted_traces.py

@@ -46,7 +46,6 @@ enum class RestrictedTraceID
 }};
 
 using ReplayFunc = void (*)(uint32_t);
-using ResetFunc = void (*)();
 using SetupFunc = void (*)();
 using DecompressFunc = uint8_t *(*)(const std::vector<uint8_t> &);
 using SetBinaryDataDirFunc = void (*)(const char *);
@@ -79,18 +78,6 @@ inline void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
     }}
 }}
 
-inline void ResetReplay(RestrictedTraceID traceID)
-{{
-    switch (traceID)
-    {{
-{reset_func_cases}
-        default:
-            fprintf(stderr, "Error in switch.\\n");
-            assert(0);
-            break;
-    }}
-}}
-
 inline void SetupReplay(RestrictedTraceID traceID)
 {{
     switch (traceID)
@@ -186,7 +173,6 @@ def gen_header(traces, header_file, format_args):
     format_args["trace_ids"] = ",\n".join(traces)
     format_args["trace_infos"] = ",\n".join(trace_infos)
     format_args["replay_func_cases"] = get_cases(traces, "ReplayContext1Frame", "frameIndex")
-    format_args["reset_func_cases"] = get_cases(traces, "ResetContext1Replay", "")
     format_args["setup_func_cases"] = get_cases(traces, "SetupContext1Replay", "")
     format_args["set_binary_data_dir_cases"] = get_cases(traces, "SetBinaryDataDir", "dataDir")
     format_args["decompress_callback_cases"] = get_cases(traces, "SetBinaryDataDecompressCallback",

src/tests/perf_tests/restricted_traces/manhattan_10.tar.gz.sha1

-018ddfe594c3d710f47865e6d72c9dee1f7a0b24
+f801199c7958b20531cbd02289daa5127090d3a5
\ No newline at end of file

src/tests/perf_tests/restricted_traces/restricted_traces.json

@@ -8,7 +8,6 @@
     ],
     "traces": [
         "manhattan_10",
-        "temple_run_300",
         "trex_200"
     ]
 }
\ No newline at end of file

src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni

@@ -9,6 +9,5 @@
 
 angle_restricted_traces = [
   "manhattan_10",
-  "temple_run_300",
   "trex_200",
 ]

src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h

@@ -11,7 +11,6 @@
 #define ANGLE_RESTRICTED_TRACES_H_
 
 #include "manhattan_10/manhattan_10_capture_context1.h"
-#include "temple_run_300/temple_run_300_capture_context1.h"
 #include "trex_200/trex_200_capture_context1.h"
 
 namespace angle
@@ -19,14 +18,12 @@ namespace angle
 enum class RestrictedTraceID
 {
     manhattan_10,
-    temple_run_300,
     trex_200,
     InvalidEnum,
     EnumCount = InvalidEnum
 };
 
 using ReplayFunc           = void (*)(uint32_t);
-using ResetFunc            = void (*)();
 using SetupFunc            = void (*)();
 using DecompressFunc       = uint8_t *(*)(const std::vector<uint8_t> &);
 using SetBinaryDataDirFunc = void (*)(const char *);
@@ -43,8 +40,6 @@ struct TraceInfo
 constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
     {RestrictedTraceID::manhattan_10,
      {manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd, "manhattan_10"}},
-    {RestrictedTraceID::temple_run_300,
-     {temple_run_300::kReplayFrameStart, temple_run_300::kReplayFrameEnd, "temple_run_300"}},
     {RestrictedTraceID::trex_200,
      {trex_200::kReplayFrameStart, trex_200::kReplayFrameEnd, "trex_200"}}};
 
@@ -58,9 +53,6 @@ inline void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
         case RestrictedTraceID::manhattan_10:
             manhattan_10::ReplayContext1Frame(frameIndex);
             break;
-        case RestrictedTraceID::temple_run_300:
-            temple_run_300::ReplayContext1Frame(frameIndex);
-            break;
         case RestrictedTraceID::trex_200:
             trex_200::ReplayContext1Frame(frameIndex);
             break;
@@ -71,26 +63,6 @@ inline void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
     }
 }
 
-inline void ResetReplay(RestrictedTraceID traceID)
-{
-    switch (traceID)
-    {
-        case RestrictedTraceID::manhattan_10:
-            manhattan_10::ResetContext1Replay();
-            break;
-        case RestrictedTraceID::temple_run_300:
-            temple_run_300::ResetContext1Replay();
-            break;
-        case RestrictedTraceID::trex_200:
-            trex_200::ResetContext1Replay();
-            break;
-        default:
-            fprintf(stderr, "Error in switch.\n");
-            assert(0);
-            break;
-    }
-}
-
 inline void SetupReplay(RestrictedTraceID traceID)
 {
     switch (traceID)
@@ -98,9 +70,6 @@ inline void SetupReplay(RestrictedTraceID traceID)
         case RestrictedTraceID::manhattan_10:
             manhattan_10::SetupContext1Replay();
             break;
-        case RestrictedTraceID::temple_run_300:
-            temple_run_300::SetupContext1Replay();
-            break;
         case RestrictedTraceID::trex_200:
             trex_200::SetupContext1Replay();
             break;
@@ -118,9 +87,6 @@ inline void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
         case RestrictedTraceID::manhattan_10:
             manhattan_10::SetBinaryDataDir(dataDir);
             break;
-        case RestrictedTraceID::temple_run_300:
-            temple_run_300::SetBinaryDataDir(dataDir);
-            break;
         case RestrictedTraceID::trex_200:
             trex_200::SetBinaryDataDir(dataDir);
             break;
@@ -138,9 +104,6 @@ inline void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, Decompres
         case RestrictedTraceID::manhattan_10:
             manhattan_10::SetBinaryDataDecompressCallback(callback);
             break;
-        case RestrictedTraceID::temple_run_300:
-            temple_run_300::SetBinaryDataDecompressCallback(callback);
-            break;
         case RestrictedTraceID::trex_200:
             trex_200::SetBinaryDataDecompressCallback(callback);
             break;
@@ -160,9 +123,6 @@ inline void SetFramebufferChangeCallback(RestrictedTraceID traceID,
         case RestrictedTraceID::manhattan_10:
             manhattan_10::SetFramebufferChangeCallback(userData, callback);
             break;
-        case RestrictedTraceID::temple_run_300:
-            temple_run_300::SetFramebufferChangeCallback(userData, callback);
-            break;
         case RestrictedTraceID::trex_200:
             trex_200::SetFramebufferChangeCallback(userData, callback);
             break;

src/tests/perf_tests/restricted_traces/temple_run_300.tar.gz.sha1

-ba65757605d9fc7b1610119d61973ed60fd9f806
\ No newline at end of file

src/tests/perf_tests/restricted_traces/trex_200.tar.gz.sha1

-63cb77e53b902e167e346e36affedf9996b84cab
+dbaacd69c219141a5395bef767655f03409089aa
\ No newline at end of file