Skip to content

A
angle
Commit 0d175f30 by Tim Van Patten Committed by Commit Bot
Options

Tests: Add eFootball PES 2021 trace

Test: angle_perftests --gtest_filter=TracePerfTest.Run/*efootball_pes_2021* Bug: angleproject:5564 Bug: angleproject:5517 Change-Id: I9738876b6a6c365984cecce01f2f09e0260b41cc Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2656989Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>
parent 85efb9d5
Showing with 51 additions and 5 deletions
scripts/code_generation_hashes/restricted_traces.json
{
"src/tests/restricted_traces/.gitignore":
"2b88beb1ea3d9f8c32d92301d0d39487",
"c4ba3bd0ed205049e330d359a5dffe3d",
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
"2b5d6505d6a8b6f3bbfbad2c8405a89d",
"src/tests/restricted_traces/arena_of_valor.tar.gz.sha1":
......@@ -17,6 +17,8 @@
"80a697dd447e4aae4fefd3627f663c4f",
"src/tests/restricted_traces/dragon_ball_legends.tar.gz.sha1":
"baabf75c08e7417bd2194e6d69bfce71",
"src/tests/restricted_traces/efootball_pes_2021.tar.gz.sha1":
"3cea8bb2d5d9e3516e5e261f5cb96fa7",
"src/tests/restricted_traces/egypt_1500.tar.gz.sha1":
"0d569cbab0adf4df1027f671c65f7bff",
"src/tests/restricted_traces/fate_grand_order.tar.gz.sha1":
......@@ -54,13 +56,13 @@
"src/tests/restricted_traces/real_gangster_crime.tar.gz.sha1":
"c85be329035a760edad673eb2ca7c3f1",
"src/tests/restricted_traces/restricted_traces.json":
"69c868aa1179eccb4a3b9cd85f7552de",
"99d86b7111aba0d57920c0e919ef4a1c",
"src/tests/restricted_traces/restricted_traces_autogen.cpp":
"b14f88349570527ec5a1f443697a609b",
"491499eb56598c3b2d6ea04f57b6b4cd",
"src/tests/restricted_traces/restricted_traces_autogen.gni":
"6ed5ba1223842ae4ef7ec6e8bfff007d",
"2fd18528154eafb0cb218f03825f691f",
"src/tests/restricted_traces/restricted_traces_autogen.h":
"583333e4b40a9aea9ef30218223f3a90",
"55aa327f99db1eb716cc3f6aad221271",
"src/tests/restricted_traces/saint_seiya_awakening.tar.gz.sha1":
"c9cde6bdfd9096a44d5f03d905a45a4f",
"src/tests/restricted_traces/subway_surfers.tar.gz.sha1":
......
src/libANGLE/Context.cpp
......@@ -3739,6 +3739,12 @@ void Context::initCaps()
"supported on some native drivers"
<< std::endl;
mState.mExtensions.noperspectiveInterpolationNV = false;
// Nvidia's Vulkan driver only supports 4 draw buffers
constexpr GLint maxDrawBuffers = 4;
INFO() << "Limiting draw buffer count to " << maxDrawBuffers
<< " while FrameCapture enabled" << std::endl;
ANGLE_LIMIT_CAP(mState.mCaps.maxDrawBuffers, maxDrawBuffers);
}
// Disable support for OES_get_program_binary
......
src/tests/perf_tests/TracePerfTest.cpp
......@@ -323,6 +323,17 @@ TracePerfTest::TracePerfTest()
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
}
if (param.testID == RestrictedTraceID::efootball_pes_2021)
{
// TODO(https://anglebug.com/5517) Linux+Intel and Pixel 2 generate "Framebuffer is
// incomplete" errors with the Vulkan backend.
if (param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE &&
((IsLinux() && IsIntel()) || IsPixel2()))
{
mSkipTest = true;
}
}
// We already swap in TracePerfTest::drawBenchmark, no need to swap again in the harness.
disableTestHarnessSwap();
......
src/tests/restricted_traces/.gitignore
......@@ -14,6 +14,8 @@ cod_mobile.tar.gz
cod_mobile/
dragon_ball_legends.tar.gz
dragon_ball_legends/
efootball_pes_2021.tar.gz
efootball_pes_2021/
egypt_1500.tar.gz
egypt_1500/
fate_grand_order.tar.gz
......
src/tests/restricted_traces/efootball_pes_2021.tar.gz.sha1 0 → 100644
559fcf0c657e9faf6b85ccac47fc5c6d8ac094d3
\ No newline at end of file
src/tests/restricted_traces/restricted_traces.json
......@@ -15,6 +15,7 @@
"clash_of_clans",
"cod_mobile",
"dragon_ball_legends",
"efootball_pes_2021",
"egypt_1500",
"fate_grand_order",
"fifa_mobile",
......
src/tests/restricted_traces/restricted_traces_autogen.cpp
......@@ -19,6 +19,7 @@
#include "clash_of_clans/clash_of_clans_capture_context1.h"
#include "cod_mobile/cod_mobile_capture_context1.h"
#include "dragon_ball_legends/dragon_ball_legends_capture_context1.h"
#include "efootball_pes_2021/efootball_pes_2021_capture_context7.h"
#include "egypt_1500/egypt_1500_capture_context1.h"
#include "fate_grand_order/fate_grand_order_capture_context1.h"
#include "fifa_mobile/fifa_mobile_capture_context2.h"
......@@ -78,6 +79,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{dragon_ball_legends::kReplayFrameStart, dragon_ball_legends::kReplayFrameEnd,
dragon_ball_legends::kReplayDrawSurfaceWidth, dragon_ball_legends::kReplayDrawSurfaceHeight,
"dragon_ball_legends"}},
{RestrictedTraceID::efootball_pes_2021,
{efootball_pes_2021::kReplayFrameStart, efootball_pes_2021::kReplayFrameEnd,
efootball_pes_2021::kReplayDrawSurfaceWidth, efootball_pes_2021::kReplayDrawSurfaceHeight,
"efootball_pes_2021"}},
{RestrictedTraceID::egypt_1500,
{egypt_1500::kReplayFrameStart, egypt_1500::kReplayFrameEnd,
egypt_1500::kReplayDrawSurfaceWidth, egypt_1500::kReplayDrawSurfaceHeight, "egypt_1500"}},
......@@ -201,6 +206,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::dragon_ball_legends:
dragon_ball_legends::ReplayContext1Frame(frameIndex);
break;
case RestrictedTraceID::efootball_pes_2021:
efootball_pes_2021::ReplayContext7Frame(frameIndex);
break;
case RestrictedTraceID::egypt_1500:
egypt_1500::ReplayContext1Frame(frameIndex);
break;
......@@ -308,6 +316,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::dragon_ball_legends:
dragon_ball_legends::ResetContext1Replay();
break;
case RestrictedTraceID::efootball_pes_2021:
efootball_pes_2021::ResetContext7Replay();
break;
case RestrictedTraceID::egypt_1500:
egypt_1500::ResetContext1Replay();
break;
......@@ -415,6 +426,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::dragon_ball_legends:
dragon_ball_legends::SetupContext1Replay();
break;
case RestrictedTraceID::efootball_pes_2021:
efootball_pes_2021::SetupContext7Replay();
break;
case RestrictedTraceID::egypt_1500:
egypt_1500::SetupContext1Replay();
break;
......@@ -522,6 +536,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::dragon_ball_legends:
dragon_ball_legends::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::efootball_pes_2021:
efootball_pes_2021::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::egypt_1500:
egypt_1500::SetBinaryDataDir(dataDir);
break;
......@@ -629,6 +646,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::dragon_ball_legends:
dragon_ball_legends::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::efootball_pes_2021:
efootball_pes_2021::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::egypt_1500:
egypt_1500::SetBinaryDataDecompressCallback(callback);
break;
......
src/tests/restricted_traces/restricted_traces_autogen.gni
......@@ -17,6 +17,7 @@ angle_restricted_traces = [
"clash_of_clans 1",
"cod_mobile 1",
"dragon_ball_legends 1",
"efootball_pes_2021 7",
"egypt_1500 1",
"fate_grand_order 1",
"fifa_mobile 2",
......
src/tests/restricted_traces/restricted_traces_autogen.h
......@@ -62,6 +62,7 @@ enum class RestrictedTraceID
clash_of_clans,
cod_mobile,
dragon_ball_legends,
efootball_pes_2021,
egypt_1500,
fate_grand_order,
fifa_mobile,
......
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