Skip to content

A
angle
Commit 8af704bd by Lubosz Sarnecki Committed by Commit Bot
Options

Tests: Add Summoners War trace.

Skip the trace on Windows/Intel since it produces GL_INVALID_ENUM. Test: angle_perftests --gtest_filter="*summoners_war*" Bug: b/181870341 Bug: angleproject:5943 Change-Id: I99b551294eeb267311728fd6f566cd549f97e90d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2887285Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Lubosz Sarnecki <lubosz.sarnecki@collabora.com>
parent cf1064e6
Showing with 90 additions and 5 deletions
DEPS
...@@ -1347,6 +1347,16 @@ deps = { ...@@ -1347,6 +1347,16 @@ deps = {
'dep_type': 'cipd', 'dep_type': 'cipd',
'condition': 'checkout_angle_restricted_traces', 'condition': 'checkout_angle_restricted_traces',
}, },
'src/tests/restricted_traces/summoners_war': {
'packages': [
{
'package': 'angle/traces/summoners_war',
'version': 'version:1',
},
],
'dep_type': 'cipd',
'condition': 'checkout_angle_restricted_traces',
},
'src/tests/restricted_traces/talking_tom_hero_dash': { 'src/tests/restricted_traces/talking_tom_hero_dash': {
'packages': [ 'packages': [
{ {
......
scripts/code_generation_hashes/restricted_traces.json
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"fa4b9593b1881cd860f3a9e59c83406f", "e355046b8ee201a5557bbded2ceaad8f",
"src/tests/restricted_traces/gen_restricted_traces.py": "src/tests/restricted_traces/gen_restricted_traces.py":
"f700505c2ba8299a6ce68962763d7f2d", "f700505c2ba8299a6ce68962763d7f2d",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"6546c6209cd27a7337b6ea4501e96852", "0c0b21d3ec54b18aec69098f84a1d9ef",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"f5485a3df343e1e470d250b6de303cfe", "27b642c7f537bf06e0cf9553869dee6b",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"13f5149cee13dfe77ff536fd75ccfd09", "416f464a380f1dec95158660c3eb8718",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"7bffa7fdb2513509f3ed28b5360d0923" "3b5ff8e62063b92db0ca34b09cfec574"
} }
\ No newline at end of file
src/tests/perf_tests/TracePerfTest.cpp
...@@ -943,6 +943,15 @@ TracePerfTest::TracePerfTest() ...@@ -943,6 +943,15 @@ TracePerfTest::TracePerfTest()
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr"); addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
} }
// TODO: http://anglebug.com/5943 GL_INVALID_ENUM on Windows/Intel.
if (param.testID == RestrictedTraceID::summoners_war)
{
if (IsWindows() && IsIntel() && param.driver != GLESDriverType::AngleEGL)
{
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();
......
src/tests/restricted_traces/.gitignore
...@@ -71,6 +71,7 @@ slingshot_test2/ ...@@ -71,6 +71,7 @@ slingshot_test2/
sniper_3d/ sniper_3d/
standoff_2/ standoff_2/
subway_surfers/ subway_surfers/
summoners_war/
talking_tom_hero_dash/ talking_tom_hero_dash/
temple_run_2/ temple_run_2/
temple_run_300/ temple_run_300/
......
src/tests/restricted_traces/restricted_traces.json
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
"sniper_3d 1", "sniper_3d 1",
"standoff_2 1", "standoff_2 1",
"subway_surfers 1", "subway_surfers 1",
"summoners_war 1",
"talking_tom_hero_dash 1", "talking_tom_hero_dash 1",
"temple_run_2 1", "temple_run_2 1",
"temple_run_300 1", "temple_run_300 1",
......
src/tests/restricted_traces/restricted_traces_autogen.cpp
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
#include "sniper_3d/sniper_3d_capture_context1.h" #include "sniper_3d/sniper_3d_capture_context1.h"
#include "standoff_2/standoff_2_capture_context1.h" #include "standoff_2/standoff_2_capture_context1.h"
#include "subway_surfers/subway_surfers_capture_context1.h" #include "subway_surfers/subway_surfers_capture_context1.h"
#include "summoners_war/summoners_war_capture_context2.h"
#include "talking_tom_hero_dash/talking_tom_hero_dash_capture_context1.h" #include "talking_tom_hero_dash/talking_tom_hero_dash_capture_context1.h"
#include "temple_run_2/temple_run_2_capture_context1.h" #include "temple_run_2/temple_run_2_capture_context1.h"
#include "temple_run_300/temple_run_300_capture_context1.h" #include "temple_run_300/temple_run_300_capture_context1.h"
...@@ -456,6 +457,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -456,6 +457,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
subway_surfers::kReplayContextClientMinorVersion, subway_surfers::kReplayFrameStart, subway_surfers::kReplayContextClientMinorVersion, subway_surfers::kReplayFrameStart,
subway_surfers::kReplayFrameEnd, subway_surfers::kReplayDrawSurfaceWidth, subway_surfers::kReplayFrameEnd, subway_surfers::kReplayDrawSurfaceWidth,
subway_surfers::kReplayDrawSurfaceHeight, "subway_surfers"}}, subway_surfers::kReplayDrawSurfaceHeight, "subway_surfers"}},
{RestrictedTraceID::summoners_war,
{summoners_war::kReplayContextClientMajorVersion,
summoners_war::kReplayContextClientMinorVersion, summoners_war::kReplayFrameStart,
summoners_war::kReplayFrameEnd, summoners_war::kReplayDrawSurfaceWidth,
summoners_war::kReplayDrawSurfaceHeight, "summoners_war"}},
{RestrictedTraceID::talking_tom_hero_dash, {RestrictedTraceID::talking_tom_hero_dash,
{talking_tom_hero_dash::kReplayContextClientMajorVersion, {talking_tom_hero_dash::kReplayContextClientMajorVersion,
talking_tom_hero_dash::kReplayContextClientMinorVersion, talking_tom_hero_dash::kReplayContextClientMinorVersion,
......
src/tests/restricted_traces/restricted_traces_autogen.gni
...@@ -3543,6 +3543,62 @@ angle_restricted_traces = [ ...@@ -3543,6 +3543,62 @@ angle_restricted_traces = [
], ],
], ],
[ [
"summoners_war",
2,
[
"summoners_war/summoners_war_capture_context2_frame001.cpp",
"summoners_war/summoners_war_capture_context2_frame002.cpp",
"summoners_war/summoners_war_capture_context2_frame003.cpp",
"summoners_war/summoners_war_capture_context2_frame004.cpp",
"summoners_war/summoners_war_capture_context2_frame005.cpp",
"summoners_war/summoners_war_capture_context2_frame006.cpp",
"summoners_war/summoners_war_capture_context2_frame007.cpp",
"summoners_war/summoners_war_capture_context2_frame008.cpp",
"summoners_war/summoners_war_capture_context2_frame009.cpp",
"summoners_war/summoners_war_capture_context2_frame010.cpp",
"summoners_war/summoners_war_capture_context2_frame011.cpp",
"summoners_war/summoners_war_capture_context2_frame012.cpp",
"summoners_war/summoners_war_capture_context2_frame013.cpp",
"summoners_war/summoners_war_capture_context2_frame014.cpp",
"summoners_war/summoners_war_capture_context2_frame015.cpp",
"summoners_war/summoners_war_capture_context2_frame016.cpp",
"summoners_war/summoners_war_capture_context2_frame017.cpp",
"summoners_war/summoners_war_capture_context2_frame018.cpp",
"summoners_war/summoners_war_capture_context2_frame019.cpp",
"summoners_war/summoners_war_capture_context2_frame020.cpp",
"summoners_war/summoners_war_capture_context2_frame021.cpp",
"summoners_war/summoners_war_capture_context2_frame022.cpp",
"summoners_war/summoners_war_capture_context2_frame023.cpp",
"summoners_war/summoners_war_capture_context2_frame024.cpp",
"summoners_war/summoners_war_capture_context2_frame025.cpp",
"summoners_war/summoners_war_capture_context2_frame026.cpp",
"summoners_war/summoners_war_capture_context2_frame027.cpp",
"summoners_war/summoners_war_capture_context2_frame028.cpp",
"summoners_war/summoners_war_capture_context2_frame029.cpp",
"summoners_war/summoners_war_capture_context2_frame030.cpp",
"summoners_war/summoners_war_capture_context2_frame031.cpp",
"summoners_war/summoners_war_capture_context2_frame032.cpp",
"summoners_war/summoners_war_capture_context2_frame033.cpp",
"summoners_war/summoners_war_capture_context2_frame034.cpp",
"summoners_war/summoners_war_capture_context2_frame035.cpp",
"summoners_war/summoners_war_capture_context2_frame036.cpp",
"summoners_war/summoners_war_capture_context2_frame037.cpp",
"summoners_war/summoners_war_capture_context2_frame038.cpp",
"summoners_war/summoners_war_capture_context2_frame039.cpp",
"summoners_war/summoners_war_capture_context2_frame040.cpp",
"summoners_war/summoners_war_capture_context2_frame041.cpp",
"summoners_war/summoners_war_capture_context2_frame042.cpp",
"summoners_war/summoners_war_capture_context2_frame043.cpp",
"summoners_war/summoners_war_capture_context2_frame044.cpp",
"summoners_war/summoners_war_capture_context2_frame045.cpp",
"summoners_war/summoners_war_capture_context2_frame046.cpp",
"summoners_war/summoners_war_capture_context2_frame047.cpp",
"summoners_war/summoners_war_capture_context2_frame048.cpp",
"summoners_war/summoners_war_capture_context2_frame049.cpp",
"summoners_war/summoners_war_capture_context2_frame050.cpp",
],
],
[
"talking_tom_hero_dash", "talking_tom_hero_dash",
1, 1,
[ [
......
src/tests/restricted_traces/restricted_traces_autogen.h
...@@ -127,6 +127,7 @@ enum class RestrictedTraceID ...@@ -127,6 +127,7 @@ enum class RestrictedTraceID
sniper_3d, sniper_3d,
standoff_2, standoff_2,
subway_surfers, subway_surfers,
summoners_war,
talking_tom_hero_dash, talking_tom_hero_dash,
temple_run_2, temple_run_2,
temple_run_300, temple_run_300,
......
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