Commit 71c7e346 by Cody Northrop Committed by Commit Bot

Tests: Add Rope Hero: Vice Town trace

Test: angle_perftests --gtest_filter="*rope_hero_vice_town*" TBR: jmadill@google.com,timvp@google.com Bug: b/181727986 Bug: angleproject:5711 Change-Id: I11021ae91f968bd453b98a35c60cab90d71e5ed6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2731288Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent a73818aa
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"2c6bceda61f25d17aa08e59810c3c04f", "97d094f939508ea18d5b2c8f45e01785",
"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":
...@@ -88,17 +88,19 @@ ...@@ -88,17 +88,19 @@
"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":
"37845fba2e9a5e634ef01c0298369a08", "e1d1b013f60fc9349d0f9190e7efa5b2",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"8406d7fb0e514cd07b4ec1403105e39b", "8cda6f05df47a23e663ef1ce44f6ad3b",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"3faae996663896654e31e17bb52f09ea", "7380c5d634735e54aebf3b7d968158b0",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"c89b22aec600f136ef14ec31bdc00a6e", "d6c08b0e6e023c3132ed34bb154f3ec1",
"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":
"a46c4faab1651f5d87374c231c8dcea6", "a46c4faab1651f5d87374c231c8dcea6",
"src/tests/restricted_traces/rope_hero_vice_town.tar.gz.sha1":
"ce79b6ef759e66cd3f08a54d4691eebd",
"src/tests/restricted_traces/saint_seiya_awakening.tar.gz.sha1": "src/tests/restricted_traces/saint_seiya_awakening.tar.gz.sha1":
"c9cde6bdfd9096a44d5f03d905a45a4f", "c9cde6bdfd9096a44d5f03d905a45a4f",
"src/tests/restricted_traces/shadow_fight_2.tar.gz.sha1": "src/tests/restricted_traces/shadow_fight_2.tar.gz.sha1":
......
...@@ -394,6 +394,15 @@ TracePerfTest::TracePerfTest() ...@@ -394,6 +394,15 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::rope_hero_vice_town)
{
// TODO: http://anglebug.com/5716 Trace crashes on Pixel 2 in vulkan driver
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();
......
...@@ -86,6 +86,8 @@ rise_of_kingdoms.tar.gz ...@@ -86,6 +86,8 @@ rise_of_kingdoms.tar.gz
rise_of_kingdoms/ rise_of_kingdoms/
romancing_saga.tar.gz romancing_saga.tar.gz
romancing_saga/ romancing_saga/
rope_hero_vice_town.tar.gz
rope_hero_vice_town/
saint_seiya_awakening.tar.gz saint_seiya_awakening.tar.gz
saint_seiya_awakening/ saint_seiya_awakening/
shadow_fight_2.tar.gz shadow_fight_2.tar.gz
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
"real_gangster_crime", "real_gangster_crime",
"rise_of_kingdoms", "rise_of_kingdoms",
"romancing_saga", "romancing_saga",
"rope_hero_vice_town",
"saint_seiya_awakening", "saint_seiya_awakening",
"shadow_fight_2", "shadow_fight_2",
"sniper_3d", "sniper_3d",
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
#include "real_gangster_crime/real_gangster_crime_capture_context3.h" #include "real_gangster_crime/real_gangster_crime_capture_context3.h"
#include "rise_of_kingdoms/rise_of_kingdoms_capture_context4.h" #include "rise_of_kingdoms/rise_of_kingdoms_capture_context4.h"
#include "romancing_saga/romancing_saga_capture_context3.h" #include "romancing_saga/romancing_saga_capture_context3.h"
#include "rope_hero_vice_town/rope_hero_vice_town_capture_context2.h"
#include "saint_seiya_awakening/saint_seiya_awakening_capture_context2.h" #include "saint_seiya_awakening/saint_seiya_awakening_capture_context2.h"
#include "shadow_fight_2/shadow_fight_2_capture_context2.h" #include "shadow_fight_2/shadow_fight_2_capture_context2.h"
#include "sniper_3d/sniper_3d_capture_context3.h" #include "sniper_3d/sniper_3d_capture_context3.h"
...@@ -282,6 +283,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -282,6 +283,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
romancing_saga::kReplayContextClientMinorVersion, romancing_saga::kReplayFrameStart, romancing_saga::kReplayContextClientMinorVersion, romancing_saga::kReplayFrameStart,
romancing_saga::kReplayFrameEnd, romancing_saga::kReplayDrawSurfaceWidth, romancing_saga::kReplayFrameEnd, romancing_saga::kReplayDrawSurfaceWidth,
romancing_saga::kReplayDrawSurfaceHeight, "romancing_saga"}}, romancing_saga::kReplayDrawSurfaceHeight, "romancing_saga"}},
{RestrictedTraceID::rope_hero_vice_town,
{rope_hero_vice_town::kReplayContextClientMajorVersion,
rope_hero_vice_town::kReplayContextClientMinorVersion, rope_hero_vice_town::kReplayFrameStart,
rope_hero_vice_town::kReplayFrameEnd, rope_hero_vice_town::kReplayDrawSurfaceWidth,
rope_hero_vice_town::kReplayDrawSurfaceHeight, "rope_hero_vice_town"}},
{RestrictedTraceID::saint_seiya_awakening, {RestrictedTraceID::saint_seiya_awakening,
{kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion, {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
saint_seiya_awakening::kReplayFrameStart, saint_seiya_awakening::kReplayFrameEnd, saint_seiya_awakening::kReplayFrameStart, saint_seiya_awakening::kReplayFrameEnd,
...@@ -487,6 +493,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -487,6 +493,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::romancing_saga: case RestrictedTraceID::romancing_saga:
romancing_saga::ReplayContext3Frame(frameIndex); romancing_saga::ReplayContext3Frame(frameIndex);
break; break;
case RestrictedTraceID::rope_hero_vice_town:
rope_hero_vice_town::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::ReplayContext2Frame(frameIndex); saint_seiya_awakening::ReplayContext2Frame(frameIndex);
break; break;
...@@ -669,6 +678,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -669,6 +678,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::romancing_saga: case RestrictedTraceID::romancing_saga:
romancing_saga::ResetContext3Replay(); romancing_saga::ResetContext3Replay();
break; break;
case RestrictedTraceID::rope_hero_vice_town:
rope_hero_vice_town::ResetContext2Replay();
break;
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::ResetContext2Replay(); saint_seiya_awakening::ResetContext2Replay();
break; break;
...@@ -851,6 +863,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -851,6 +863,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::romancing_saga: case RestrictedTraceID::romancing_saga:
romancing_saga::SetupContext3Replay(); romancing_saga::SetupContext3Replay();
break; break;
case RestrictedTraceID::rope_hero_vice_town:
rope_hero_vice_town::SetupContext2Replay();
break;
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::SetupContext2Replay(); saint_seiya_awakening::SetupContext2Replay();
break; break;
...@@ -1033,6 +1048,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -1033,6 +1048,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::romancing_saga: case RestrictedTraceID::romancing_saga:
romancing_saga::SetBinaryDataDir(dataDir); romancing_saga::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::rope_hero_vice_town:
rope_hero_vice_town::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::SetBinaryDataDir(dataDir); saint_seiya_awakening::SetBinaryDataDir(dataDir);
break; break;
...@@ -1215,6 +1233,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -1215,6 +1233,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::romancing_saga: case RestrictedTraceID::romancing_saga:
romancing_saga::SetBinaryDataDecompressCallback(callback); romancing_saga::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::rope_hero_vice_town:
rope_hero_vice_town::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::SetBinaryDataDecompressCallback(callback); saint_seiya_awakening::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -53,6 +53,7 @@ angle_restricted_traces = [ ...@@ -53,6 +53,7 @@ angle_restricted_traces = [
"real_gangster_crime 3", "real_gangster_crime 3",
"rise_of_kingdoms 4", "rise_of_kingdoms 4",
"romancing_saga 3", "romancing_saga 3",
"rope_hero_vice_town 2",
"saint_seiya_awakening 2", "saint_seiya_awakening 2",
"shadow_fight_2 2", "shadow_fight_2 2",
"sniper_3d 3", "sniper_3d 3",
......
...@@ -98,6 +98,7 @@ enum class RestrictedTraceID ...@@ -98,6 +98,7 @@ enum class RestrictedTraceID
real_gangster_crime, real_gangster_crime,
rise_of_kingdoms, rise_of_kingdoms,
romancing_saga, romancing_saga,
rope_hero_vice_town,
saint_seiya_awakening, saint_seiya_awakening,
shadow_fight_2, shadow_fight_2,
sniper_3d, sniper_3d,
......
b6a7b80b8ee0bd084ff0399e515d0986d296217a
\ No newline at end of file
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