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,
......
......@@ -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