Commit 861378be by Tim Van Patten Committed by Commit Bot

Tests: Add Magic Tile 3 trace

Test: angle_perftests --gtest_filter=TracePerfTest.Run/*magic_tiles_3* Bug: angleproject:5540 Change-Id: I6d6f144d4c2a38cfc55724f7e454f756a162d054 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2622611 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent c07ef602
{
"src/tests/restricted_traces/.gitignore":
"9563bf9ee34d4668ff5eab13626d151b",
"4003908a2d8c910c80fc728b4053f11e",
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
"2b5d6505d6a8b6f3bbfbad2c8405a89d",
"src/tests/restricted_traces/arena_of_valor.tar.gz.sha1":
......@@ -31,6 +31,8 @@
"c11aab56dcaba570a1993c1f8ebe4668",
"src/tests/restricted_traces/lego_legacy.tar.gz.sha1":
"543b6beed660d7206c2839c6811aa9f4",
"src/tests/restricted_traces/magic_tiles_3.tar.gz.sha1":
"e31a9dcfc1734a407d3f54183941f965",
"src/tests/restricted_traces/manhattan_10.tar.gz.sha1":
"f24ffb3d8150ea69b71df0e391af2fed",
"src/tests/restricted_traces/marvel_contest_of_champions.tar.gz.sha1":
......@@ -44,13 +46,13 @@
"src/tests/restricted_traces/real_commando_secret_mission.tar.gz.sha1":
"4b484dd9c53a79100ec13b6f1c86040d",
"src/tests/restricted_traces/restricted_traces.json":
"8fcaedb1a53858bc4ba8f323fbd3f757",
"78f508f059516f77db7944c00596a1d6",
"src/tests/restricted_traces/restricted_traces_autogen.cpp":
"8403cd3e7d45726750ecbb6f48268337",
"7d8d99db13002f091b10738c70c2d79a",
"src/tests/restricted_traces/restricted_traces_autogen.gni":
"64f04587e3b4c68d40187e0e0ec577fb",
"aba82e135789d353da2a25ec4c2c09a0",
"src/tests/restricted_traces/restricted_traces_autogen.h":
"b948f29413ec2fdee7bd9a9241b36ad1",
"41985b9537e97dd7501c30aac4e4d023",
"src/tests/restricted_traces/saint_seiya_awakening.tar.gz.sha1":
"c9cde6bdfd9096a44d5f03d905a45a4f",
"src/tests/restricted_traces/temple_run_300.tar.gz.sha1":
......
......@@ -301,6 +301,12 @@ TracePerfTest::TracePerfTest()
}
}
if (param.testID == RestrictedTraceID::magic_tiles_3)
{
// Linux+Nvidia doesn't support GL_KHR_texture_compression_astc_ldr (possibly others also)
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
}
// We already swap in TracePerfTest::drawBenchmark, no need to swap again in the harness.
disableTestHarnessSwap();
......
......@@ -26,6 +26,8 @@ kartrider_rush.tar.gz
kartrider_rush/
lego_legacy.tar.gz
lego_legacy/
magic_tiles_3.tar.gz
magic_tiles_3/
manhattan_10.tar.gz
manhattan_10/
marvel_contest_of_champions.tar.gz
......
e26c86a225d7820b9419f53a930fe630e18d6178
\ No newline at end of file
......@@ -21,6 +21,7 @@
"google_maps",
"kartrider_rush",
"lego_legacy",
"magic_tiles_3",
"manhattan_10",
"marvel_contest_of_champions",
"mobile_legends",
......
......@@ -25,6 +25,7 @@
#include "google_maps/google_maps_capture_context3.h"
#include "kartrider_rush/kartrider_rush_capture_context1.h"
#include "lego_legacy/lego_legacy_capture_context2.h"
#include "magic_tiles_3/magic_tiles_3_capture_context2.h"
#include "manhattan_10/manhattan_10_capture_context1.h"
#include "marvel_contest_of_champions/marvel_contest_of_champions_capture_context1.h"
#include "mobile_legends/mobile_legends_capture_context1.h"
......@@ -92,6 +93,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{RestrictedTraceID::lego_legacy,
{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,
magic_tiles_3::kReplayDrawSurfaceWidth, magic_tiles_3::kReplayDrawSurfaceHeight,
"magic_tiles_3"}},
{RestrictedTraceID::manhattan_10,
{manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd,
manhattan_10::kReplayDrawSurfaceWidth, manhattan_10::kReplayDrawSurfaceHeight,
......@@ -191,6 +196,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::lego_legacy:
lego_legacy::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::magic_tiles_3:
magic_tiles_3::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::manhattan_10:
manhattan_10::ReplayContext1Frame(frameIndex);
break;
......@@ -280,6 +288,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::lego_legacy:
lego_legacy::ResetContext2Replay();
break;
case RestrictedTraceID::magic_tiles_3:
magic_tiles_3::ResetContext2Replay();
break;
case RestrictedTraceID::manhattan_10:
manhattan_10::ResetContext1Replay();
break;
......@@ -369,6 +380,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::lego_legacy:
lego_legacy::SetupContext2Replay();
break;
case RestrictedTraceID::magic_tiles_3:
magic_tiles_3::SetupContext2Replay();
break;
case RestrictedTraceID::manhattan_10:
manhattan_10::SetupContext1Replay();
break;
......@@ -458,6 +472,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::lego_legacy:
lego_legacy::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::magic_tiles_3:
magic_tiles_3::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::manhattan_10:
manhattan_10::SetBinaryDataDir(dataDir);
break;
......@@ -547,6 +564,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::lego_legacy:
lego_legacy::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::magic_tiles_3:
magic_tiles_3::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::manhattan_10:
manhattan_10::SetBinaryDataDecompressCallback(callback);
break;
......
......@@ -23,6 +23,7 @@ angle_restricted_traces = [
"google_maps 3",
"kartrider_rush 1",
"lego_legacy 2",
"magic_tiles_3 2",
"manhattan_10 1",
"marvel_contest_of_champions 1",
"mobile_legends 1",
......
......@@ -68,6 +68,7 @@ enum class RestrictedTraceID
google_maps,
kartrider_rush,
lego_legacy,
magic_tiles_3,
manhattan_10,
marvel_contest_of_champions,
mobile_legends,
......
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