Commit f6eccc20 by Cody Northrop Committed by Commit Bot

Tests: Add June's Journey trace

Test: angle_perftests --gtest_filter="*junes_journey*" TBR: jmadill@google.com,timvp@google.com Bug: b/182566407 Bug: angleproject:5752 Change-Id: I083507949c9bc16bf701028a678540df9a3531dc Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2755840Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent 716b2cba
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"109f280e7cbf8147446642d5c39a9987", "2c6ec5159385fd1df677f5e9129ca34b",
"src/tests/restricted_traces/aliexpress.tar.gz.sha1": "src/tests/restricted_traces/aliexpress.tar.gz.sha1":
"12f48ff0c4ca7980ea879c81b0c9518b", "12f48ff0c4ca7980ea879c81b0c9518b",
"src/tests/restricted_traces/among_us.tar.gz.sha1": "src/tests/restricted_traces/among_us.tar.gz.sha1":
...@@ -57,6 +57,8 @@ ...@@ -57,6 +57,8 @@
"73fa97c4ab9be39017725c219666e908", "73fa97c4ab9be39017725c219666e908",
"src/tests/restricted_traces/hill_climb_racing.tar.gz.sha1": "src/tests/restricted_traces/hill_climb_racing.tar.gz.sha1":
"3026eeb93388fe35fa3e5e4eed95ef96", "3026eeb93388fe35fa3e5e4eed95ef96",
"src/tests/restricted_traces/junes_journey.tar.gz.sha1":
"a7bd336ada3bf24c79b3e9529906fd60",
"src/tests/restricted_traces/kartrider_rush.tar.gz.sha1": "src/tests/restricted_traces/kartrider_rush.tar.gz.sha1":
"c11aab56dcaba570a1993c1f8ebe4668", "c11aab56dcaba570a1993c1f8ebe4668",
"src/tests/restricted_traces/klondike_adventures.tar.gz.sha1": "src/tests/restricted_traces/klondike_adventures.tar.gz.sha1":
...@@ -94,13 +96,13 @@ ...@@ -94,13 +96,13 @@
"src/tests/restricted_traces/real_gangster_crime.tar.gz.sha1": "src/tests/restricted_traces/real_gangster_crime.tar.gz.sha1":
"c85be329035a760edad673eb2ca7c3f1", "c85be329035a760edad673eb2ca7c3f1",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"53c08acf0dbb2e5558f2ddc253cc9437", "5414f1121cad66b7b19f8584ff2005de",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"ee4443af895aceb575c1ace1bb202c6a", "d6eb220a5f6767da5aa61f418b2d1a64",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"3f1dc277b29c6883497b6960ccba9e5e", "850c1dca3c4b466b224816549f2926dc",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"efa301ef19ee3fe951b3a5ca945a0066", "d8477afa7b21354f8aa9e3815dfe0a18",
"src/tests/restricted_traces/rise_of_kingdoms.tar.gz.sha1": "src/tests/restricted_traces/rise_of_kingdoms.tar.gz.sha1":
"d4618f857c44f0dfa642ae3af8f161d9", "d4618f857c44f0dfa642ae3af8f161d9",
"src/tests/restricted_traces/romancing_saga.tar.gz.sha1": "src/tests/restricted_traces/romancing_saga.tar.gz.sha1":
......
...@@ -431,6 +431,11 @@ TracePerfTest::TracePerfTest() ...@@ -431,6 +431,11 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::junes_journey)
{
addExtensionPrerequisite("GL_OES_EGL_image_external");
}
// We already swap in TracePerfTest::drawBenchmark, no need to swap again in the harness. // We already swap in TracePerfTest::drawBenchmark, no need to swap again in the harness.
disableTestHarnessSwap(); disableTestHarnessSwap();
......
...@@ -52,6 +52,8 @@ hearthstone.tar.gz ...@@ -52,6 +52,8 @@ hearthstone.tar.gz
hearthstone/ hearthstone/
hill_climb_racing.tar.gz hill_climb_racing.tar.gz
hill_climb_racing/ hill_climb_racing/
junes_journey.tar.gz
junes_journey/
kartrider_rush.tar.gz kartrider_rush.tar.gz
kartrider_rush/ kartrider_rush/
klondike_adventures.tar.gz klondike_adventures.tar.gz
......
824a47b0bc7eac79c03c9315a666ebc641cfc147
\ No newline at end of file
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
"hay_day", "hay_day",
"hearthstone", "hearthstone",
"hill_climb_racing", "hill_climb_racing",
"junes_journey",
"kartrider_rush", "kartrider_rush",
"klondike_adventures", "klondike_adventures",
"lego_legacy", "lego_legacy",
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "hay_day/hay_day_capture_context2.h" #include "hay_day/hay_day_capture_context2.h"
#include "hearthstone/hearthstone_capture_context2.h" #include "hearthstone/hearthstone_capture_context2.h"
#include "hill_climb_racing/hill_climb_racing_capture_context2.h" #include "hill_climb_racing/hill_climb_racing_capture_context2.h"
#include "junes_journey/junes_journey_capture_context2.h"
#include "kartrider_rush/kartrider_rush_capture_context1.h" #include "kartrider_rush/kartrider_rush_capture_context1.h"
#include "klondike_adventures/klondike_adventures_capture_context2.h" #include "klondike_adventures/klondike_adventures_capture_context2.h"
#include "lego_legacy/lego_legacy_capture_context2.h" #include "lego_legacy/lego_legacy_capture_context2.h"
...@@ -205,6 +206,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -205,6 +206,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
hill_climb_racing::kReplayContextClientMinorVersion, hill_climb_racing::kReplayFrameStart, hill_climb_racing::kReplayContextClientMinorVersion, hill_climb_racing::kReplayFrameStart,
hill_climb_racing::kReplayFrameEnd, hill_climb_racing::kReplayDrawSurfaceWidth, hill_climb_racing::kReplayFrameEnd, hill_climb_racing::kReplayDrawSurfaceWidth,
hill_climb_racing::kReplayDrawSurfaceHeight, "hill_climb_racing"}}, hill_climb_racing::kReplayDrawSurfaceHeight, "hill_climb_racing"}},
{RestrictedTraceID::junes_journey,
{junes_journey::kReplayContextClientMajorVersion,
junes_journey::kReplayContextClientMinorVersion, junes_journey::kReplayFrameStart,
junes_journey::kReplayFrameEnd, junes_journey::kReplayDrawSurfaceWidth,
junes_journey::kReplayDrawSurfaceHeight, "junes_journey"}},
{RestrictedTraceID::kartrider_rush, {RestrictedTraceID::kartrider_rush,
{kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion, {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
kartrider_rush::kReplayFrameStart, kartrider_rush::kReplayFrameEnd, kartrider_rush::kReplayFrameStart, kartrider_rush::kReplayFrameEnd,
...@@ -461,6 +467,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -461,6 +467,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::hill_climb_racing: case RestrictedTraceID::hill_climb_racing:
hill_climb_racing::ReplayContext2Frame(frameIndex); hill_climb_racing::ReplayContext2Frame(frameIndex);
break; break;
case RestrictedTraceID::junes_journey:
junes_journey::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::ReplayContext1Frame(frameIndex); kartrider_rush::ReplayContext1Frame(frameIndex);
break; break;
...@@ -655,6 +664,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -655,6 +664,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::hill_climb_racing: case RestrictedTraceID::hill_climb_racing:
hill_climb_racing::ResetContext2Replay(); hill_climb_racing::ResetContext2Replay();
break; break;
case RestrictedTraceID::junes_journey:
junes_journey::ResetContext2Replay();
break;
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::ResetContext1Replay(); kartrider_rush::ResetContext1Replay();
break; break;
...@@ -849,6 +861,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -849,6 +861,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::hill_climb_racing: case RestrictedTraceID::hill_climb_racing:
hill_climb_racing::SetupContext2Replay(); hill_climb_racing::SetupContext2Replay();
break; break;
case RestrictedTraceID::junes_journey:
junes_journey::SetupContext2Replay();
break;
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::SetupContext1Replay(); kartrider_rush::SetupContext1Replay();
break; break;
...@@ -1043,6 +1058,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -1043,6 +1058,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::hill_climb_racing: case RestrictedTraceID::hill_climb_racing:
hill_climb_racing::SetBinaryDataDir(dataDir); hill_climb_racing::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::junes_journey:
junes_journey::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::SetBinaryDataDir(dataDir); kartrider_rush::SetBinaryDataDir(dataDir);
break; break;
...@@ -1237,6 +1255,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -1237,6 +1255,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::hill_climb_racing: case RestrictedTraceID::hill_climb_racing:
hill_climb_racing::SetBinaryDataDecompressCallback(callback); hill_climb_racing::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::junes_journey:
junes_journey::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::SetBinaryDataDecompressCallback(callback); kartrider_rush::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -36,6 +36,7 @@ angle_restricted_traces = [ ...@@ -36,6 +36,7 @@ angle_restricted_traces = [
"hay_day 2", "hay_day 2",
"hearthstone 2", "hearthstone 2",
"hill_climb_racing 2", "hill_climb_racing 2",
"junes_journey 2",
"kartrider_rush 1", "kartrider_rush 1",
"klondike_adventures 2", "klondike_adventures 2",
"lego_legacy 2", "lego_legacy 2",
......
...@@ -81,6 +81,7 @@ enum class RestrictedTraceID ...@@ -81,6 +81,7 @@ enum class RestrictedTraceID
hay_day, hay_day,
hearthstone, hearthstone,
hill_climb_racing, hill_climb_racing,
junes_journey,
kartrider_rush, kartrider_rush,
klondike_adventures, klondike_adventures,
lego_legacy, lego_legacy,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment