Skip to content

A
angle
Commit 9b3b5733 by Cody Northrop Committed by Commit Bot
Options

Tests: Add Ragnarok M: Eternal Love trace

Test: angle_perftests --gtest_filter="*ragnarok_m_eternal_love*" TBR: timvp@google.com,jmadill@google.com Bug: b/181800519 Bug: angleproject:5772 Change-Id: I1dcde486e909f7c2b5d59132e5f673c7e8ab1d01 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2774264Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent ba0bd785
Showing with 48 additions and 5 deletions
scripts/code_generation_hashes/restricted_traces.json
{
"src/tests/restricted_traces/.gitignore":
"2c6ec5159385fd1df677f5e9129ca34b",
"f5f9499ae2af272b495047184e990e8a",
"src/tests/restricted_traces/aliexpress.tar.gz.sha1":
"12f48ff0c4ca7980ea879c81b0c9518b",
"src/tests/restricted_traces/among_us.tar.gz.sha1":
......@@ -89,6 +89,8 @@
"fe1d7c220de5c5942195c0bc56267149",
"src/tests/restricted_traces/pubg_mobile_lite.tar.gz.sha1":
"6a77372489ee4b43639b684a39ab8d71",
"src/tests/restricted_traces/ragnarok_m_eternal_love.tar.gz.sha1":
"370d7d960100a8244fe0e811af65006b",
"src/tests/restricted_traces/raid_shadow_legends.tar.gz.sha1":
"18b0f7f021bd65340f25a70b79dd4789",
"src/tests/restricted_traces/real_commando_secret_mission.tar.gz.sha1":
......@@ -96,13 +98,13 @@
"src/tests/restricted_traces/real_gangster_crime.tar.gz.sha1":
"c85be329035a760edad673eb2ca7c3f1",
"src/tests/restricted_traces/restricted_traces.json":
"5414f1121cad66b7b19f8584ff2005de",
"3ab4afd98fb76838fcf0a105be9921d0",
"src/tests/restricted_traces/restricted_traces_autogen.cpp":
"d6eb220a5f6767da5aa61f418b2d1a64",
"8d1cb4e5cbf99156eb8e98292f48ebe4",
"src/tests/restricted_traces/restricted_traces_autogen.gni":
"850c1dca3c4b466b224816549f2926dc",
"cb771409fc0f33ee841316567f81f443",
"src/tests/restricted_traces/restricted_traces_autogen.h":
"d8477afa7b21354f8aa9e3815dfe0a18",
"4936c5880b688e115fbafa03348ee9fa",
"src/tests/restricted_traces/rise_of_kingdoms.tar.gz.sha1":
"d4618f857c44f0dfa642ae3af8f161d9",
"src/tests/restricted_traces/romancing_saga.tar.gz.sha1":
......
src/tests/perf_tests/TracePerfTest.cpp
......@@ -436,6 +436,18 @@ TracePerfTest::TracePerfTest()
addExtensionPrerequisite("GL_OES_EGL_image_external");
}
if (param.testID == RestrictedTraceID::ragnarok_m_eternal_love)
{
addExtensionPrerequisite("GL_OES_EGL_image_external");
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
// TODO: http://anglebug.com/5772 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.
disableTestHarnessSwap();
......
src/tests/restricted_traces/.gitignore
......@@ -84,6 +84,8 @@ plants_vs_zombies_2.tar.gz
plants_vs_zombies_2/
pubg_mobile_lite.tar.gz
pubg_mobile_lite/
ragnarok_m_eternal_love.tar.gz
ragnarok_m_eternal_love/
raid_shadow_legends.tar.gz
raid_shadow_legends/
real_commando_secret_mission.tar.gz
......
src/tests/restricted_traces/ragnarok_m_eternal_love.tar.gz.sha1 0 → 100644
86fcba6b18f882cb41f3544b8f8e109011af35d5
\ No newline at end of file
src/tests/restricted_traces/restricted_traces.json
......@@ -50,6 +50,7 @@
"one_punch_man",
"plants_vs_zombies_2",
"pubg_mobile_lite",
"ragnarok_m_eternal_love",
"raid_shadow_legends",
"real_commando_secret_mission",
"real_gangster_crime",
......
src/tests/restricted_traces/restricted_traces_autogen.cpp
......@@ -54,6 +54,7 @@
#include "one_punch_man/one_punch_man_capture_context3.h"
#include "plants_vs_zombies_2/plants_vs_zombies_2_capture_context1.h"
#include "pubg_mobile_lite/pubg_mobile_lite_capture_context1.h"
#include "ragnarok_m_eternal_love/ragnarok_m_eternal_love_capture_context3.h"
#include "raid_shadow_legends/raid_shadow_legends_capture_context2.h"
#include "real_commando_secret_mission/real_commando_secret_mission_capture_context1.h"
#include "real_gangster_crime/real_gangster_crime_capture_context3.h"
......@@ -282,6 +283,12 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
pubg_mobile_lite::kReplayFrameStart, pubg_mobile_lite::kReplayFrameEnd,
pubg_mobile_lite::kReplayDrawSurfaceWidth, pubg_mobile_lite::kReplayDrawSurfaceHeight,
"pubg_mobile_lite"}},
{RestrictedTraceID::ragnarok_m_eternal_love,
{ragnarok_m_eternal_love::kReplayContextClientMajorVersion,
ragnarok_m_eternal_love::kReplayContextClientMinorVersion,
ragnarok_m_eternal_love::kReplayFrameStart, ragnarok_m_eternal_love::kReplayFrameEnd,
ragnarok_m_eternal_love::kReplayDrawSurfaceWidth,
ragnarok_m_eternal_love::kReplayDrawSurfaceHeight, "ragnarok_m_eternal_love"}},
{RestrictedTraceID::raid_shadow_legends,
{raid_shadow_legends::kReplayContextClientMajorVersion,
raid_shadow_legends::kReplayContextClientMinorVersion, raid_shadow_legends::kReplayFrameStart,
......@@ -515,6 +522,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::pubg_mobile_lite:
pubg_mobile_lite::ReplayContext1Frame(frameIndex);
break;
case RestrictedTraceID::ragnarok_m_eternal_love:
ragnarok_m_eternal_love::ReplayContext3Frame(frameIndex);
break;
case RestrictedTraceID::raid_shadow_legends:
raid_shadow_legends::ReplayContext2Frame(frameIndex);
break;
......@@ -712,6 +722,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::pubg_mobile_lite:
pubg_mobile_lite::ResetContext1Replay();
break;
case RestrictedTraceID::ragnarok_m_eternal_love:
ragnarok_m_eternal_love::ResetContext3Replay();
break;
case RestrictedTraceID::raid_shadow_legends:
raid_shadow_legends::ResetContext2Replay();
break;
......@@ -909,6 +922,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::pubg_mobile_lite:
pubg_mobile_lite::SetupContext1Replay();
break;
case RestrictedTraceID::ragnarok_m_eternal_love:
ragnarok_m_eternal_love::SetupContext3Replay();
break;
case RestrictedTraceID::raid_shadow_legends:
raid_shadow_legends::SetupContext2Replay();
break;
......@@ -1106,6 +1122,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::pubg_mobile_lite:
pubg_mobile_lite::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::ragnarok_m_eternal_love:
ragnarok_m_eternal_love::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::raid_shadow_legends:
raid_shadow_legends::SetBinaryDataDir(dataDir);
break;
......@@ -1303,6 +1322,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::pubg_mobile_lite:
pubg_mobile_lite::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::ragnarok_m_eternal_love:
ragnarok_m_eternal_love::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::raid_shadow_legends:
raid_shadow_legends::SetBinaryDataDecompressCallback(callback);
break;
......
src/tests/restricted_traces/restricted_traces_autogen.gni
......@@ -52,6 +52,7 @@ angle_restricted_traces = [
"one_punch_man 3",
"plants_vs_zombies_2 1",
"pubg_mobile_lite 1",
"ragnarok_m_eternal_love 3",
"raid_shadow_legends 2",
"real_commando_secret_mission 1",
"real_gangster_crime 3",
......
src/tests/restricted_traces/restricted_traces_autogen.h
......@@ -97,6 +97,7 @@ enum class RestrictedTraceID
one_punch_man,
plants_vs_zombies_2,
pubg_mobile_lite,
ragnarok_m_eternal_love,
raid_shadow_legends,
real_commando_secret_mission,
real_gangster_crime,
......
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