Commit 7a699140 by Cody Northrop Committed by Commit Bot

Tests: Add Dragon Raja trace

Bug: b/184105957 Bug: angleproject:5807 Change-Id: I2a6d20a872311fb8b2c601c9a796b4f582ba5144 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2796403 Commit-Queue: Cody Northrop <cnorthrop@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 67e4aff5
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"dfc50f056ec1b5f5bf70e01daa127cca", "4fbdf9f45b9a615c42005c39c14dd5a1",
"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":
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
"c40fb4ab22955e4713d52616cbe4975f", "c40fb4ab22955e4713d52616cbe4975f",
"src/tests/restricted_traces/dragon_ball_legends.tar.gz.sha1": "src/tests/restricted_traces/dragon_ball_legends.tar.gz.sha1":
"baabf75c08e7417bd2194e6d69bfce71", "baabf75c08e7417bd2194e6d69bfce71",
"src/tests/restricted_traces/dragon_raja.tar.gz.sha1":
"3c111fe0d8a1ac4e121114c14f3cf581",
"src/tests/restricted_traces/efootball_pes_2021.tar.gz.sha1": "src/tests/restricted_traces/efootball_pes_2021.tar.gz.sha1":
"3cea8bb2d5d9e3516e5e261f5cb96fa7", "3cea8bb2d5d9e3516e5e261f5cb96fa7",
"src/tests/restricted_traces/egypt_1500.tar.gz.sha1": "src/tests/restricted_traces/egypt_1500.tar.gz.sha1":
...@@ -106,13 +108,13 @@ ...@@ -106,13 +108,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":
"debaedd4ff42ff354575bc4c7f7f2f8a", "fe4b0321246ef9ac4243c0d5ed9553d0",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"f907fcbb6e36bc18e8ae196a9ec86e57", "46620754f74076ee16756075fa16c9ca",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"04c28d463752abe5fa1fb2c285864f7e", "eff15c7c32bbab20ad5e211c99236bff",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"6a03447b0e2d52ec4a22bcb09acffd4b", "cfab65aadcb9090a90099538b5083bc5",
"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":
......
...@@ -481,6 +481,19 @@ TracePerfTest::TracePerfTest() ...@@ -481,6 +481,19 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::dragon_raja)
{
addExtensionPrerequisite("GL_OES_EGL_image_external");
// TODO: http://anglebug.com/5807 Intel Linux and Pixel 2 error with "Framebuffer is
// incomplete" on Vulkan
if (((IsLinux() && IsIntel()) || 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();
......
...@@ -30,6 +30,8 @@ coin_master.tar.gz ...@@ -30,6 +30,8 @@ coin_master.tar.gz
coin_master/ coin_master/
dragon_ball_legends.tar.gz dragon_ball_legends.tar.gz
dragon_ball_legends/ dragon_ball_legends/
dragon_raja.tar.gz
dragon_raja/
efootball_pes_2021.tar.gz efootball_pes_2021.tar.gz
efootball_pes_2021/ efootball_pes_2021/
egypt_1500.tar.gz egypt_1500.tar.gz
......
17df192eb44a5bba67daeacb1fe6bfb0794e4c0b
\ No newline at end of file
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
"cod_mobile", "cod_mobile",
"coin_master", "coin_master",
"dragon_ball_legends", "dragon_ball_legends",
"dragon_raja",
"efootball_pes_2021", "efootball_pes_2021",
"egypt_1500", "egypt_1500",
"eight_ball_pool", "eight_ball_pool",
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "cod_mobile/cod_mobile_capture_context1.h" #include "cod_mobile/cod_mobile_capture_context1.h"
#include "coin_master/coin_master_capture_context2.h" #include "coin_master/coin_master_capture_context2.h"
#include "dragon_ball_legends/dragon_ball_legends_capture_context1.h" #include "dragon_ball_legends/dragon_ball_legends_capture_context1.h"
#include "dragon_raja/dragon_raja_capture_context10.h"
#include "efootball_pes_2021/efootball_pes_2021_capture_context7.h" #include "efootball_pes_2021/efootball_pes_2021_capture_context7.h"
#include "egypt_1500/egypt_1500_capture_context1.h" #include "egypt_1500/egypt_1500_capture_context1.h"
#include "eight_ball_pool/eight_ball_pool_capture_context2.h" #include "eight_ball_pool/eight_ball_pool_capture_context2.h"
...@@ -158,6 +159,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -158,6 +159,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
dragon_ball_legends::kReplayFrameStart, dragon_ball_legends::kReplayFrameEnd, dragon_ball_legends::kReplayFrameStart, dragon_ball_legends::kReplayFrameEnd,
dragon_ball_legends::kReplayDrawSurfaceWidth, dragon_ball_legends::kReplayDrawSurfaceHeight, dragon_ball_legends::kReplayDrawSurfaceWidth, dragon_ball_legends::kReplayDrawSurfaceHeight,
"dragon_ball_legends"}}, "dragon_ball_legends"}},
{RestrictedTraceID::dragon_raja,
{dragon_raja::kReplayContextClientMajorVersion, dragon_raja::kReplayContextClientMinorVersion,
dragon_raja::kReplayFrameStart, dragon_raja::kReplayFrameEnd,
dragon_raja::kReplayDrawSurfaceWidth, dragon_raja::kReplayDrawSurfaceHeight, "dragon_raja"}},
{RestrictedTraceID::efootball_pes_2021, {RestrictedTraceID::efootball_pes_2021,
{efootball_pes_2021::kReplayContextClientMajorVersion, {efootball_pes_2021::kReplayContextClientMajorVersion,
efootball_pes_2021::kReplayContextClientMinorVersion, efootball_pes_2021::kReplayFrameStart, efootball_pes_2021::kReplayContextClientMinorVersion, efootball_pes_2021::kReplayFrameStart,
...@@ -464,6 +469,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -464,6 +469,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::dragon_ball_legends: case RestrictedTraceID::dragon_ball_legends:
dragon_ball_legends::ReplayContext1Frame(frameIndex); dragon_ball_legends::ReplayContext1Frame(frameIndex);
break; break;
case RestrictedTraceID::dragon_raja:
dragon_raja::ReplayContext10Frame(frameIndex);
break;
case RestrictedTraceID::efootball_pes_2021: case RestrictedTraceID::efootball_pes_2021:
efootball_pes_2021::ReplayContext7Frame(frameIndex); efootball_pes_2021::ReplayContext7Frame(frameIndex);
break; break;
...@@ -676,6 +684,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -676,6 +684,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::dragon_ball_legends: case RestrictedTraceID::dragon_ball_legends:
dragon_ball_legends::ResetContext1Replay(); dragon_ball_legends::ResetContext1Replay();
break; break;
case RestrictedTraceID::dragon_raja:
dragon_raja::ResetContext10Replay();
break;
case RestrictedTraceID::efootball_pes_2021: case RestrictedTraceID::efootball_pes_2021:
efootball_pes_2021::ResetContext7Replay(); efootball_pes_2021::ResetContext7Replay();
break; break;
...@@ -888,6 +899,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -888,6 +899,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::dragon_ball_legends: case RestrictedTraceID::dragon_ball_legends:
dragon_ball_legends::SetupContext1Replay(); dragon_ball_legends::SetupContext1Replay();
break; break;
case RestrictedTraceID::dragon_raja:
dragon_raja::SetupContext10Replay();
break;
case RestrictedTraceID::efootball_pes_2021: case RestrictedTraceID::efootball_pes_2021:
efootball_pes_2021::SetupContext7Replay(); efootball_pes_2021::SetupContext7Replay();
break; break;
...@@ -1100,6 +1114,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -1100,6 +1114,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::dragon_ball_legends: case RestrictedTraceID::dragon_ball_legends:
dragon_ball_legends::SetBinaryDataDir(dataDir); dragon_ball_legends::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::dragon_raja:
dragon_raja::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::efootball_pes_2021: case RestrictedTraceID::efootball_pes_2021:
efootball_pes_2021::SetBinaryDataDir(dataDir); efootball_pes_2021::SetBinaryDataDir(dataDir);
break; break;
...@@ -1312,6 +1329,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -1312,6 +1329,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::dragon_ball_legends: case RestrictedTraceID::dragon_ball_legends:
dragon_ball_legends::SetBinaryDataDecompressCallback(callback); dragon_ball_legends::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::dragon_raja:
dragon_raja::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::efootball_pes_2021: case RestrictedTraceID::efootball_pes_2021:
efootball_pes_2021::SetBinaryDataDecompressCallback(callback); efootball_pes_2021::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -25,6 +25,7 @@ angle_restricted_traces = [ ...@@ -25,6 +25,7 @@ angle_restricted_traces = [
"cod_mobile 1", "cod_mobile 1",
"coin_master 2", "coin_master 2",
"dragon_ball_legends 1", "dragon_ball_legends 1",
"dragon_raja 10",
"efootball_pes_2021 7", "efootball_pes_2021 7",
"egypt_1500 1", "egypt_1500 1",
"eight_ball_pool 2", "eight_ball_pool 2",
......
...@@ -70,6 +70,7 @@ enum class RestrictedTraceID ...@@ -70,6 +70,7 @@ enum class RestrictedTraceID
cod_mobile, cod_mobile,
coin_master, coin_master,
dragon_ball_legends, dragon_ball_legends,
dragon_raja,
efootball_pes_2021, efootball_pes_2021,
egypt_1500, egypt_1500,
eight_ball_pool, eight_ball_pool,
......
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