Commit 87b1875c by Cody Northrop Committed by Commit Bot

Tests: Add Among Us trace

Test: angle_perftests --gtest_filter="*among_us*" TBR: jmadill@google.com,timvp@google.com Bug: b/181616715 Bug: angleproject:5698 Change-Id: If52ee0e989c6b4a3c21b4a2bc0b77dbbea2a3d6d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2728564Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent 6b6da203
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"2d8dfb6d78cc28197b5fa37a7dcf2b51", "ac219d0b1a2226c6a2e02a6281c82f5e",
"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":
"6fcc4409e6f23a59680c99bcdeb75889",
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1": "src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
"2b5d6505d6a8b6f3bbfbad2c8405a89d", "2b5d6505d6a8b6f3bbfbad2c8405a89d",
"src/tests/restricted_traces/arena_of_valor.tar.gz.sha1": "src/tests/restricted_traces/arena_of_valor.tar.gz.sha1":
...@@ -84,13 +86,13 @@ ...@@ -84,13 +86,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":
"030dab939ec64fcdabdfbe6b05662e53", "09bd4ec521b2c1f8480fd0e631e3a3e2",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"8c3d796ac3b9bafd3a84cb33a708706a", "cf4d2d42aded575e8961aac4a64e7783",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"16b9118b91f903331c934c7b1786fe7f", "49c5823d89229be023fec0fe38e81d1f",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"8eb2d7cf7be4d567a041e219e2192a18", "c216961fd499aa3ede9e9a7587298ea8",
"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":
......
...@@ -380,6 +380,11 @@ TracePerfTest::TracePerfTest() ...@@ -380,6 +380,11 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::among_us)
{
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
}
// 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();
......
aliexpress.tar.gz aliexpress.tar.gz
aliexpress/ aliexpress/
among_us.tar.gz
among_us/
angry_birds_2_1500.tar.gz angry_birds_2_1500.tar.gz
angry_birds_2_1500/ angry_birds_2_1500/
arena_of_valor.tar.gz arena_of_valor.tar.gz
......
5746d4cfd3906da66a8b4c20f20b30028b22f93a
\ No newline at end of file
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
], ],
"traces": [ "traces": [
"aliexpress", "aliexpress",
"among_us",
"angry_birds_2_1500", "angry_birds_2_1500",
"arena_of_valor", "arena_of_valor",
"asphalt_8", "asphalt_8",
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "common/PackedEnums.h" #include "common/PackedEnums.h"
#include "aliexpress/aliexpress_capture_context1.h" #include "aliexpress/aliexpress_capture_context1.h"
#include "among_us/among_us_capture_context2.h"
#include "angry_birds_2_1500/angry_birds_2_1500_capture_context1.h" #include "angry_birds_2_1500/angry_birds_2_1500_capture_context1.h"
#include "arena_of_valor/arena_of_valor_capture_context1.h" #include "arena_of_valor/arena_of_valor_capture_context1.h"
#include "asphalt_8/asphalt_8_capture_context2.h" #include "asphalt_8/asphalt_8_capture_context2.h"
...@@ -74,6 +75,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -74,6 +75,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{aliexpress::kReplayContextClientMajorVersion, aliexpress::kReplayContextClientMinorVersion, {aliexpress::kReplayContextClientMajorVersion, aliexpress::kReplayContextClientMinorVersion,
aliexpress::kReplayFrameStart, aliexpress::kReplayFrameEnd, aliexpress::kReplayFrameStart, aliexpress::kReplayFrameEnd,
aliexpress::kReplayDrawSurfaceWidth, aliexpress::kReplayDrawSurfaceHeight, "aliexpress"}}, aliexpress::kReplayDrawSurfaceWidth, aliexpress::kReplayDrawSurfaceHeight, "aliexpress"}},
{RestrictedTraceID::among_us,
{among_us::kReplayContextClientMajorVersion, among_us::kReplayContextClientMinorVersion,
among_us::kReplayFrameStart, among_us::kReplayFrameEnd, among_us::kReplayDrawSurfaceWidth,
among_us::kReplayDrawSurfaceHeight, "among_us"}},
{RestrictedTraceID::angry_birds_2_1500, {RestrictedTraceID::angry_birds_2_1500,
{kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion, {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
angry_birds_2_1500::kReplayFrameStart, angry_birds_2_1500::kReplayFrameEnd, angry_birds_2_1500::kReplayFrameStart, angry_birds_2_1500::kReplayFrameEnd,
...@@ -334,6 +339,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -334,6 +339,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::aliexpress: case RestrictedTraceID::aliexpress:
aliexpress::ReplayContext1Frame(frameIndex); aliexpress::ReplayContext1Frame(frameIndex);
break; break;
case RestrictedTraceID::among_us:
among_us::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::angry_birds_2_1500: case RestrictedTraceID::angry_birds_2_1500:
angry_birds_2_1500::ReplayContext1Frame(frameIndex); angry_birds_2_1500::ReplayContext1Frame(frameIndex);
break; break;
...@@ -504,6 +512,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -504,6 +512,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::aliexpress: case RestrictedTraceID::aliexpress:
aliexpress::ResetContext1Replay(); aliexpress::ResetContext1Replay();
break; break;
case RestrictedTraceID::among_us:
among_us::ResetContext2Replay();
break;
case RestrictedTraceID::angry_birds_2_1500: case RestrictedTraceID::angry_birds_2_1500:
angry_birds_2_1500::ResetContext1Replay(); angry_birds_2_1500::ResetContext1Replay();
break; break;
...@@ -674,6 +685,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -674,6 +685,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::aliexpress: case RestrictedTraceID::aliexpress:
aliexpress::SetupContext1Replay(); aliexpress::SetupContext1Replay();
break; break;
case RestrictedTraceID::among_us:
among_us::SetupContext2Replay();
break;
case RestrictedTraceID::angry_birds_2_1500: case RestrictedTraceID::angry_birds_2_1500:
angry_birds_2_1500::SetupContext1Replay(); angry_birds_2_1500::SetupContext1Replay();
break; break;
...@@ -844,6 +858,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -844,6 +858,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::aliexpress: case RestrictedTraceID::aliexpress:
aliexpress::SetBinaryDataDir(dataDir); aliexpress::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::among_us:
among_us::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::angry_birds_2_1500: case RestrictedTraceID::angry_birds_2_1500:
angry_birds_2_1500::SetBinaryDataDir(dataDir); angry_birds_2_1500::SetBinaryDataDir(dataDir);
break; break;
...@@ -1014,6 +1031,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -1014,6 +1031,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::aliexpress: case RestrictedTraceID::aliexpress:
aliexpress::SetBinaryDataDecompressCallback(callback); aliexpress::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::among_us:
among_us::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::angry_birds_2_1500: case RestrictedTraceID::angry_birds_2_1500:
angry_birds_2_1500::SetBinaryDataDecompressCallback(callback); angry_birds_2_1500::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
angle_restricted_traces = [ angle_restricted_traces = [
"aliexpress 1", "aliexpress 1",
"among_us 2",
"angry_birds_2_1500 1", "angry_birds_2_1500 1",
"arena_of_valor 1", "arena_of_valor 1",
"asphalt_8 2", "asphalt_8 2",
......
...@@ -55,6 +55,7 @@ namespace angle ...@@ -55,6 +55,7 @@ namespace angle
enum class RestrictedTraceID enum class RestrictedTraceID
{ {
aliexpress, aliexpress,
among_us,
angry_birds_2_1500, angry_birds_2_1500,
arena_of_valor, arena_of_valor,
asphalt_8, asphalt_8,
......
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