Commit 811568a9 by Cody Northrop Committed by Commit Bot

Tests: Add Aztec Ruins trace

Test: angle_perftests --gtest_filter="*aztec_ruins*" Tbr: jmadill@google.com,timvp@google.com Bug: b/160808198 Bug: angleproject:5553 Change-Id: I24e3ae44698c5347fa5b9412d6a3ab16fb4f5c08 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2634206Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent 2a0f4251
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"e12a364d63009499459ca6ed24e08d0f", "dfc50f056ec1b5f5bf70e01daa127cca",
"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":
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
"83e8aa4663fa6130db0bff09fb915f36", "83e8aa4663fa6130db0bff09fb915f36",
"src/tests/restricted_traces/avakin_life.tar.gz.sha1": "src/tests/restricted_traces/avakin_life.tar.gz.sha1":
"371845cdb84fddc484fed2c857d3b9db", "371845cdb84fddc484fed2c857d3b9db",
"src/tests/restricted_traces/aztec_ruins.tar.gz.sha1":
"9d8fd6e9d0b31ab57241802466201de5",
"src/tests/restricted_traces/brawl_stars.tar.gz.sha1": "src/tests/restricted_traces/brawl_stars.tar.gz.sha1":
"8b1cf8ebd8a1099b4d298bb3b446e8bd", "8b1cf8ebd8a1099b4d298bb3b446e8bd",
"src/tests/restricted_traces/bus_simulator_indonesia.tar.gz.sha1": "src/tests/restricted_traces/bus_simulator_indonesia.tar.gz.sha1":
...@@ -104,13 +106,13 @@ ...@@ -104,13 +106,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":
"494faf0ba328c3b28c588c0e23186485", "debaedd4ff42ff354575bc4c7f7f2f8a",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"ba7268755266624616d2be045371ff48", "f907fcbb6e36bc18e8ae196a9ec86e57",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"fbffa64ef398d95d61bc07345b6b3f31", "04c28d463752abe5fa1fb2c285864f7e",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"0ccd4e553bc13ae2101d2d58cfbf73eb", "6a03447b0e2d52ec4a22bcb09acffd4b",
"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":
......
...@@ -470,6 +470,17 @@ TracePerfTest::TracePerfTest() ...@@ -470,6 +470,17 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::aztec_ruins)
{
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
// TODO: http://anglebug.com/5553 Pixel 2 errors with "Framebuffer is incomplete" on Vulkan
if (IsPixel2() && param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE)
{
mSkipTest = true;
}
}
// 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();
......
...@@ -10,6 +10,8 @@ asphalt_8.tar.gz ...@@ -10,6 +10,8 @@ asphalt_8.tar.gz
asphalt_8/ asphalt_8/
avakin_life.tar.gz avakin_life.tar.gz
avakin_life/ avakin_life/
aztec_ruins.tar.gz
aztec_ruins/
brawl_stars.tar.gz brawl_stars.tar.gz
brawl_stars/ brawl_stars/
bus_simulator_indonesia.tar.gz bus_simulator_indonesia.tar.gz
......
dcced0b5c247eb5f1dce54eb8d765de8e1ecd195
\ No newline at end of file
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
"arena_of_valor", "arena_of_valor",
"asphalt_8", "asphalt_8",
"avakin_life", "avakin_life",
"aztec_ruins",
"brawl_stars", "brawl_stars",
"bus_simulator_indonesia", "bus_simulator_indonesia",
"candy_crush_500", "candy_crush_500",
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#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"
#include "avakin_life/avakin_life_capture_context2.h" #include "avakin_life/avakin_life_capture_context2.h"
#include "aztec_ruins/aztec_ruins_capture_context6.h"
#include "brawl_stars/brawl_stars_capture_context1.h" #include "brawl_stars/brawl_stars_capture_context1.h"
#include "bus_simulator_indonesia/bus_simulator_indonesia_capture_context1.h" #include "bus_simulator_indonesia/bus_simulator_indonesia_capture_context1.h"
#include "candy_crush_500/candy_crush_500_capture_context1.h" #include "candy_crush_500/candy_crush_500_capture_context1.h"
...@@ -109,6 +110,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -109,6 +110,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{avakin_life::kReplayContextClientMajorVersion, avakin_life::kReplayContextClientMinorVersion, {avakin_life::kReplayContextClientMajorVersion, avakin_life::kReplayContextClientMinorVersion,
avakin_life::kReplayFrameStart, avakin_life::kReplayFrameEnd, avakin_life::kReplayFrameStart, avakin_life::kReplayFrameEnd,
avakin_life::kReplayDrawSurfaceWidth, avakin_life::kReplayDrawSurfaceHeight, "avakin_life"}}, avakin_life::kReplayDrawSurfaceWidth, avakin_life::kReplayDrawSurfaceHeight, "avakin_life"}},
{RestrictedTraceID::aztec_ruins,
{aztec_ruins::kReplayContextClientMajorVersion, aztec_ruins::kReplayContextClientMinorVersion,
aztec_ruins::kReplayFrameStart, aztec_ruins::kReplayFrameEnd,
aztec_ruins::kReplayDrawSurfaceWidth, aztec_ruins::kReplayDrawSurfaceHeight, "aztec_ruins"}},
{RestrictedTraceID::brawl_stars, {RestrictedTraceID::brawl_stars,
{kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion, {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
brawl_stars::kReplayFrameStart, brawl_stars::kReplayFrameEnd, brawl_stars::kReplayFrameStart, brawl_stars::kReplayFrameEnd,
...@@ -429,6 +434,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -429,6 +434,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::avakin_life: case RestrictedTraceID::avakin_life:
avakin_life::ReplayContext2Frame(frameIndex); avakin_life::ReplayContext2Frame(frameIndex);
break; break;
case RestrictedTraceID::aztec_ruins:
aztec_ruins::ReplayContext6Frame(frameIndex);
break;
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::ReplayContext1Frame(frameIndex); brawl_stars::ReplayContext1Frame(frameIndex);
break; break;
...@@ -638,6 +646,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -638,6 +646,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::avakin_life: case RestrictedTraceID::avakin_life:
avakin_life::ResetContext2Replay(); avakin_life::ResetContext2Replay();
break; break;
case RestrictedTraceID::aztec_ruins:
aztec_ruins::ResetContext6Replay();
break;
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::ResetContext1Replay(); brawl_stars::ResetContext1Replay();
break; break;
...@@ -847,6 +858,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -847,6 +858,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::avakin_life: case RestrictedTraceID::avakin_life:
avakin_life::SetupContext2Replay(); avakin_life::SetupContext2Replay();
break; break;
case RestrictedTraceID::aztec_ruins:
aztec_ruins::SetupContext6Replay();
break;
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::SetupContext1Replay(); brawl_stars::SetupContext1Replay();
break; break;
...@@ -1056,6 +1070,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -1056,6 +1070,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::avakin_life: case RestrictedTraceID::avakin_life:
avakin_life::SetBinaryDataDir(dataDir); avakin_life::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::aztec_ruins:
aztec_ruins::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::SetBinaryDataDir(dataDir); brawl_stars::SetBinaryDataDir(dataDir);
break; break;
...@@ -1265,6 +1282,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -1265,6 +1282,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::avakin_life: case RestrictedTraceID::avakin_life:
avakin_life::SetBinaryDataDecompressCallback(callback); avakin_life::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::aztec_ruins:
aztec_ruins::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::SetBinaryDataDecompressCallback(callback); brawl_stars::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -15,6 +15,7 @@ angle_restricted_traces = [ ...@@ -15,6 +15,7 @@ angle_restricted_traces = [
"arena_of_valor 1", "arena_of_valor 1",
"asphalt_8 2", "asphalt_8 2",
"avakin_life 2", "avakin_life 2",
"aztec_ruins 6",
"brawl_stars 1", "brawl_stars 1",
"bus_simulator_indonesia 1", "bus_simulator_indonesia 1",
"candy_crush_500 1", "candy_crush_500 1",
......
...@@ -60,6 +60,7 @@ enum class RestrictedTraceID ...@@ -60,6 +60,7 @@ enum class RestrictedTraceID
arena_of_valor, arena_of_valor,
asphalt_8, asphalt_8,
avakin_life, avakin_life,
aztec_ruins,
brawl_stars, brawl_stars,
bus_simulator_indonesia, bus_simulator_indonesia,
candy_crush_500, candy_crush_500,
......
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