Commit 8feb5c82 by Cody Northrop Committed by Commit Bot

Tests: Add Marvel Contest of Champions trace

Test: angle_perftests --gtest_filter="*marvel_contest_of_champions*" Bug: b/171334313 Change-Id: Ia1195a5647ad2805e3cabd23c15719eb1ebc3534 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2487764 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com>
parent 032431a1
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"df7b65db17f6db84e1c1c45f1027bdb1", "cababe61df13c60c4bf75017178a867e",
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1": "src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
"44fc5437c4a84012e338b3da4b6fc28a", "44fc5437c4a84012e338b3da4b6fc28a",
"src/tests/restricted_traces/arena_of_valor.tar.gz.sha1": "src/tests/restricted_traces/arena_of_valor.tar.gz.sha1":
...@@ -19,18 +19,20 @@ ...@@ -19,18 +19,20 @@
"a520ef50175b1b9a20383a884e293b54", "a520ef50175b1b9a20383a884e293b54",
"src/tests/restricted_traces/manhattan_10.tar.gz.sha1": "src/tests/restricted_traces/manhattan_10.tar.gz.sha1":
"752781119592a190cc02b773adf38fc3", "752781119592a190cc02b773adf38fc3",
"src/tests/restricted_traces/marvel_contest_of_champions.tar.gz.sha1":
"d95d5167639b7b72ae9ae51f77b70f7e",
"src/tests/restricted_traces/mobile_legends.tar.gz.sha1": "src/tests/restricted_traces/mobile_legends.tar.gz.sha1":
"a3fe48a3acc2165a7fb3eb6cf01b441f", "a3fe48a3acc2165a7fb3eb6cf01b441f",
"src/tests/restricted_traces/nba2k20_800.tar.gz.sha1": "src/tests/restricted_traces/nba2k20_800.tar.gz.sha1":
"03df0dcf41c18bc59edfc0b088ca4a87", "03df0dcf41c18bc59edfc0b088ca4a87",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"03d84b1e4d3e5a3cfadd050750b9b1ce", "92754f0dc16c9aa4e2c31699c78ed771",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"bf2e36f2de6c095228ad8a9655eae0a9", "90c4690798c3a0208f1e3dc15938762b",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"b6f1670b97ae0ea561f107721de4ca90", "5c41df13ceeb7a41a59ab8e86b223eab",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"522c35f107b20fc2031da4b87590fe85", "d242dcd3e814076b84d3fdf54e67f545",
"src/tests/restricted_traces/temple_run_300.tar.gz.sha1": "src/tests/restricted_traces/temple_run_300.tar.gz.sha1":
"77475b0186ee0380eeb9db47433d0457", "77475b0186ee0380eeb9db47433d0457",
"src/tests/restricted_traces/trex_200.tar.gz.sha1": "src/tests/restricted_traces/trex_200.tar.gz.sha1":
......
...@@ -245,6 +245,11 @@ TracePerfTest::TracePerfTest() ...@@ -245,6 +245,11 @@ TracePerfTest::TracePerfTest()
addExtensionPrerequisite("GL_OES_EGL_image_external"); addExtensionPrerequisite("GL_OES_EGL_image_external");
} }
if (param.testID == RestrictedTraceID::marvel_contest_of_champions)
{
addExtensionPrerequisite("GL_EXT_color_buffer_half_float");
}
// 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();
......
...@@ -14,6 +14,8 @@ free_fire.tar.gz ...@@ -14,6 +14,8 @@ free_fire.tar.gz
free_fire/ free_fire/
manhattan_10.tar.gz manhattan_10.tar.gz
manhattan_10/ manhattan_10/
marvel_contest_of_champions.tar.gz
marvel_contest_of_champions/
mobile_legends.tar.gz mobile_legends.tar.gz
mobile_legends/ mobile_legends/
nba2k20_800.tar.gz nba2k20_800.tar.gz
......
a18181372a664461b640d4935e519fe2096892ca
\ No newline at end of file
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
"egypt_1500", "egypt_1500",
"free_fire", "free_fire",
"manhattan_10", "manhattan_10",
"marvel_contest_of_champions",
"mobile_legends", "mobile_legends",
"nba2k20_800", "nba2k20_800",
"temple_run_300", "temple_run_300",
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "egypt_1500/egypt_1500_capture_context6.h" #include "egypt_1500/egypt_1500_capture_context6.h"
#include "free_fire/free_fire_capture_context3.h" #include "free_fire/free_fire_capture_context3.h"
#include "manhattan_10/manhattan_10_capture_context6.h" #include "manhattan_10/manhattan_10_capture_context6.h"
#include "marvel_contest_of_champions/marvel_contest_of_champions_capture_context2.h"
#include "mobile_legends/mobile_legends_capture_context3.h" #include "mobile_legends/mobile_legends_capture_context3.h"
#include "nba2k20_800/nba2k20_800_capture_context1.h" #include "nba2k20_800/nba2k20_800_capture_context1.h"
#include "temple_run_300/temple_run_300_capture_context1.h" #include "temple_run_300/temple_run_300_capture_context1.h"
...@@ -57,6 +58,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -57,6 +58,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd, {manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd,
manhattan_10::kReplayDrawSurfaceWidth, manhattan_10::kReplayDrawSurfaceHeight, manhattan_10::kReplayDrawSurfaceWidth, manhattan_10::kReplayDrawSurfaceHeight,
"manhattan_10"}}, "manhattan_10"}},
{RestrictedTraceID::marvel_contest_of_champions,
{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::mobile_legends, {RestrictedTraceID::mobile_legends,
{mobile_legends::kReplayFrameStart, mobile_legends::kReplayFrameEnd, {mobile_legends::kReplayFrameStart, mobile_legends::kReplayFrameEnd,
mobile_legends::kReplayDrawSurfaceWidth, mobile_legends::kReplayDrawSurfaceHeight, mobile_legends::kReplayDrawSurfaceWidth, mobile_legends::kReplayDrawSurfaceHeight,
...@@ -106,6 +111,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -106,6 +111,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::ReplayContext6Frame(frameIndex); manhattan_10::ReplayContext6Frame(frameIndex);
break; break;
case RestrictedTraceID::marvel_contest_of_champions:
marvel_contest_of_champions::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::mobile_legends: case RestrictedTraceID::mobile_legends:
mobile_legends::ReplayContext3Frame(frameIndex); mobile_legends::ReplayContext3Frame(frameIndex);
break; break;
...@@ -153,6 +161,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -153,6 +161,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::ResetContext6Replay(); manhattan_10::ResetContext6Replay();
break; break;
case RestrictedTraceID::marvel_contest_of_champions:
marvel_contest_of_champions::ResetContext2Replay();
break;
case RestrictedTraceID::mobile_legends: case RestrictedTraceID::mobile_legends:
mobile_legends::ResetContext3Replay(); mobile_legends::ResetContext3Replay();
break; break;
...@@ -200,6 +211,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -200,6 +211,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::SetupContext6Replay(); manhattan_10::SetupContext6Replay();
break; break;
case RestrictedTraceID::marvel_contest_of_champions:
marvel_contest_of_champions::SetupContext2Replay();
break;
case RestrictedTraceID::mobile_legends: case RestrictedTraceID::mobile_legends:
mobile_legends::SetupContext3Replay(); mobile_legends::SetupContext3Replay();
break; break;
...@@ -247,6 +261,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -247,6 +261,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::SetBinaryDataDir(dataDir); manhattan_10::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::marvel_contest_of_champions:
marvel_contest_of_champions::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::mobile_legends: case RestrictedTraceID::mobile_legends:
mobile_legends::SetBinaryDataDir(dataDir); mobile_legends::SetBinaryDataDir(dataDir);
break; break;
...@@ -294,6 +311,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -294,6 +311,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::SetBinaryDataDecompressCallback(callback); manhattan_10::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::marvel_contest_of_champions:
marvel_contest_of_champions::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::mobile_legends: case RestrictedTraceID::mobile_legends:
mobile_legends::SetBinaryDataDecompressCallback(callback); mobile_legends::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -17,6 +17,7 @@ angle_restricted_traces = [ ...@@ -17,6 +17,7 @@ angle_restricted_traces = [
"egypt_1500 6", "egypt_1500 6",
"free_fire 3", "free_fire 3",
"manhattan_10 6", "manhattan_10 6",
"marvel_contest_of_champions 2",
"mobile_legends 3", "mobile_legends 3",
"nba2k20_800 1", "nba2k20_800 1",
"temple_run_300 1", "temple_run_300 1",
......
...@@ -48,6 +48,7 @@ enum class RestrictedTraceID ...@@ -48,6 +48,7 @@ enum class RestrictedTraceID
egypt_1500, egypt_1500,
free_fire, free_fire,
manhattan_10, manhattan_10,
marvel_contest_of_champions,
mobile_legends, mobile_legends,
nba2k20_800, nba2k20_800,
temple_run_300, temple_run_300,
......
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