Commit b604f843 by Lubosz Sarnecki Committed by Commit Bot

Tests: Add Professional Baseball Spirits trace.

Skip the test on Vulkan+AMD+Linux, as it produces OpenGL errors on Mesa/RADV. Also skip the test on Vulkan+Intel+Linux, as it requires a Mesa version of 20.3.5 or higher to work. Test: angle_perftests --gtest_filter="*professional_baseball_spirits*" Bug: b/181870336 Bug: angleproject:5827 Change-Id: Ic9c5e3767cb6cf7e925cfbcd2ae5dda0d736b87c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2810788Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Lubosz Sarnecki <lubosz.sarnecki@collabora.com>
parent 83c90f24
......@@ -827,6 +827,16 @@ deps = {
'dep_type': 'cipd',
'condition': 'checkout_angle_internal',
},
'src/tests/restricted_traces/professional_baseball_spirits': {
'packages': [
{
'package': 'angle/traces/professional_baseball_spirits',
'version': 'version:1',
},
],
'dep_type': 'cipd',
'condition': 'checkout_angle_internal',
},
'src/tests/restricted_traces/pubg_mobile_lite': {
'packages': [
{
......
{
"src/tests/restricted_traces/.gitignore":
"c7ac7a320c3e12648c17973cbf68d6a8",
"8c6c30f492d6a6b1811246eaaa3ff697",
"src/tests/restricted_traces/gen_restricted_traces.py":
"754de0f59746bfa03aed9b48a6e7f022",
"src/tests/restricted_traces/restricted_traces.json":
"de225d6d750984b82ffde448b38dd0c4",
"1d89493d2c76c4348f69ad03acf6166f",
"src/tests/restricted_traces/restricted_traces_autogen.cpp":
"368fb16ca6e88622597aa833925c3113",
"be6ad784c92bc524e96603ddba46c523",
"src/tests/restricted_traces/restricted_traces_autogen.gni":
"9720292281e77d94b0a05f9f547ad1b7",
"38c8d1f49685517bfb8439b88b317f07",
"src/tests/restricted_traces/restricted_traces_autogen.h":
"83eaada3b519fc51960e96b34036dcac"
"507c9a01781116249e7c2955f7412d23"
}
\ No newline at end of file
......@@ -518,6 +518,19 @@ TracePerfTest::TracePerfTest()
addExtensionPrerequisite("GL_OES_EGL_image_external");
}
if (param.testID == RestrictedTraceID::professional_baseball_spirits)
{
// TODO(https://anglebug.com/5827) Linux+Mesa/RADV Vulkan generates
// GL_INVALID_FRAMEBUFFER_OPERATION.
// Mesa versions below 20.3.5 produce the same issue on Linux+Mesa/Intel Vulkan
if (IsLinux() && (IsAMD() || IsIntel()) &&
param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE &&
param.eglParameters.deviceType != EGL_PLATFORM_ANGLE_DEVICE_TYPE_SWIFTSHADER_ANGLE)
{
mSkipTest = true;
}
}
// We already swap in TracePerfTest::drawBenchmark, no need to swap again in the harness.
disableTestHarnessSwap();
......
......@@ -45,6 +45,7 @@ mobile_legends/
nba2k20_800/
one_punch_man/
plants_vs_zombies_2/
professional_baseball_spirits/
pubg_mobile_lite/
ragnarok_m_eternal_love/
raid_shadow_legends/
......
......@@ -55,6 +55,7 @@
"nba2k20_800 1",
"one_punch_man 1",
"plants_vs_zombies_2 1",
"professional_baseball_spirits 1",
"pubg_mobile_lite 1",
"ragnarok_m_eternal_love 1",
"raid_shadow_legends 1",
......
......@@ -59,6 +59,7 @@
#include "nba2k20_800/nba2k20_800_capture_context1.h"
#include "one_punch_man/one_punch_man_capture_context1.h"
#include "plants_vs_zombies_2/plants_vs_zombies_2_capture_context1.h"
#include "professional_baseball_spirits/professional_baseball_spirits_capture_context1.h"
#include "pubg_mobile_lite/pubg_mobile_lite_capture_context1.h"
#include "ragnarok_m_eternal_love/ragnarok_m_eternal_love_capture_context1.h"
#include "raid_shadow_legends/raid_shadow_legends_capture_context1.h"
......@@ -309,6 +310,13 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
plants_vs_zombies_2::kReplayContextClientMinorVersion, plants_vs_zombies_2::kReplayFrameStart,
plants_vs_zombies_2::kReplayFrameEnd, plants_vs_zombies_2::kReplayDrawSurfaceWidth,
plants_vs_zombies_2::kReplayDrawSurfaceHeight, "plants_vs_zombies_2"}},
{RestrictedTraceID::professional_baseball_spirits,
{professional_baseball_spirits::kReplayContextClientMajorVersion,
professional_baseball_spirits::kReplayContextClientMinorVersion,
professional_baseball_spirits::kReplayFrameStart,
professional_baseball_spirits::kReplayFrameEnd,
professional_baseball_spirits::kReplayDrawSurfaceWidth,
professional_baseball_spirits::kReplayDrawSurfaceHeight, "professional_baseball_spirits"}},
{RestrictedTraceID::pubg_mobile_lite,
{pubg_mobile_lite::kReplayContextClientMajorVersion,
pubg_mobile_lite::kReplayContextClientMinorVersion, pubg_mobile_lite::kReplayFrameStart,
......
......@@ -1238,6 +1238,212 @@ angle_restricted_traces = [
],
],
[
"professional_baseball_spirits",
1,
[
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame001.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame002.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame003.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame004.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame005.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame006.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame007.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame008.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame009.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame010.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame011.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame012.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame013.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame014.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame015.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame016.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame017.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame018.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame019.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame020.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame021.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame022.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame023.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame024.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame025.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame026.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame027.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame028.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame029.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame030.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame031.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame032.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame033.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame034.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame035.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame036.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame037.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame038.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame039.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame040.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame041.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame042.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame043.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame044.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame045.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame046.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame047.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame048.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame049.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame050.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame051.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame052.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame053.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame054.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame055.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame056.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame057.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame058.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame059.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame060.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame061.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame062.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame063.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame064.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame065.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame066.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame067.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame068.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame069.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame070.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame071.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame072.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame073.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame074.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame075.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame076.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame077.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame078.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame079.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame080.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame081.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame082.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame083.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame084.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame085.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame086.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame087.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame088.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame089.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame090.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame091.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame092.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame093.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame094.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame095.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame096.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame097.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame098.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame099.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame100.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame101.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame102.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame103.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame104.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame105.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame106.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame107.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame108.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame109.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame110.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame111.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame112.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame113.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame114.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame115.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame116.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame117.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame118.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame119.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame120.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame121.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame122.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame123.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame124.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame125.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame126.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame127.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame128.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame129.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame130.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame131.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame132.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame133.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame134.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame135.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame136.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame137.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame138.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame139.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame140.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame141.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame142.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame143.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame144.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame145.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame146.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame147.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame148.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame149.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame150.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame151.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame152.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame153.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame154.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame155.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame156.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame157.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame158.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame159.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame160.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame161.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame162.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame163.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame164.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame165.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame166.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame167.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame168.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame169.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame170.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame171.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame172.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame173.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame174.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame175.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame176.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame177.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame178.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame179.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame180.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame181.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame182.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame183.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame184.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame185.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame186.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame187.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame188.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame189.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame190.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame191.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame192.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame193.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame194.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame195.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame196.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame197.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame198.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame199.cpp",
"professional_baseball_spirits/professional_baseball_spirits_capture_context1_frame200.cpp",
],
],
[
"pubg_mobile_lite",
1,
[
......
......@@ -101,6 +101,7 @@ enum class RestrictedTraceID
nba2k20_800,
one_punch_man,
plants_vs_zombies_2,
professional_baseball_spirits,
pubg_mobile_lite,
ragnarok_m_eternal_love,
raid_shadow_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