Skip to content

A
angle
Commit 565f1b16 by Cody Northrop Committed by Commit Bot
Options

Tests: Add LEGO Legacy trace

Requires GL_EXT_shadow_samplers which is not exposed by Qualcomm's native driver on Pixel 4 XL. Test: angle_perftests --gtest_filter="*lego_legacy*" Bug: b/161716126 Bug: angleproject:5373 Bug: angleproject:5374 Change-Id: Ifff9c5e878b7fe9a3ade684ae5f8e57167f01a25 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2477441 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com>
parent f845a387
Showing with 38 additions and 5 deletions
scripts/code_generation_hashes/restricted_traces.json
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"d5726b6a94502ab787506adff19284ee", "5b71b2b075b662d4521065ef538b8ab9",
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1": "src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
"2b5d6505d6a8b6f3bbfbad2c8405a89d", "2b5d6505d6a8b6f3bbfbad2c8405a89d",
"src/tests/restricted_traces/arena_of_valor.tar.gz.sha1": "src/tests/restricted_traces/arena_of_valor.tar.gz.sha1":
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
"eccb9514e9606eb56b24cf57598e596c", "eccb9514e9606eb56b24cf57598e596c",
"src/tests/restricted_traces/kartrider_rush.tar.gz.sha1": "src/tests/restricted_traces/kartrider_rush.tar.gz.sha1":
"c11aab56dcaba570a1993c1f8ebe4668", "c11aab56dcaba570a1993c1f8ebe4668",
"src/tests/restricted_traces/lego_legacy.tar.gz.sha1":
"543b6beed660d7206c2839c6811aa9f4",
"src/tests/restricted_traces/manhattan_10.tar.gz.sha1": "src/tests/restricted_traces/manhattan_10.tar.gz.sha1":
"f24ffb3d8150ea69b71df0e391af2fed", "f24ffb3d8150ea69b71df0e391af2fed",
"src/tests/restricted_traces/marvel_contest_of_champions.tar.gz.sha1": "src/tests/restricted_traces/marvel_contest_of_champions.tar.gz.sha1":
...@@ -38,13 +40,13 @@ ...@@ -38,13 +40,13 @@
"src/tests/restricted_traces/real_commando_secret_mission.tar.gz.sha1": "src/tests/restricted_traces/real_commando_secret_mission.tar.gz.sha1":
"4b484dd9c53a79100ec13b6f1c86040d", "4b484dd9c53a79100ec13b6f1c86040d",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"409567d34961d31f9624ba43783fe2f3", "6b9e6a9b5110683399d05f934288c588",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"47e925e155579d8293858bee531aa3e3", "933ad0eb824aeb69af362182a742fae0",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"217b5f08593e80c6d3beb9e8a88055cd", "92beea51b5013695956bf4d4997ea84e",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"599c5bd34872a7ca9e70adb1d5bcd7ba", "c741e3163016dc14bce5badc318b13ce",
"src/tests/restricted_traces/temple_run_300.tar.gz.sha1": "src/tests/restricted_traces/temple_run_300.tar.gz.sha1":
"0a08ce3df88cb358ccac3ac63ba04955", "0a08ce3df88cb358ccac3ac63ba04955",
"src/tests/restricted_traces/trex_200.tar.gz.sha1": "src/tests/restricted_traces/trex_200.tar.gz.sha1":
......
src/tests/perf_tests/TracePerfTest.cpp
...@@ -278,6 +278,11 @@ TracePerfTest::TracePerfTest() ...@@ -278,6 +278,11 @@ TracePerfTest::TracePerfTest()
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr"); addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
} }
if (param.testID == RestrictedTraceID::lego_legacy)
{
addExtensionPrerequisite("GL_EXT_shadow_samplers");
}
// 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
...@@ -20,6 +20,8 @@ free_fire.tar.gz ...@@ -20,6 +20,8 @@ free_fire.tar.gz
free_fire/ free_fire/
kartrider_rush.tar.gz kartrider_rush.tar.gz
kartrider_rush/ kartrider_rush/
lego_legacy.tar.gz
lego_legacy/
manhattan_10.tar.gz manhattan_10.tar.gz
manhattan_10/ manhattan_10/
marvel_contest_of_champions.tar.gz marvel_contest_of_champions.tar.gz
......
src/tests/restricted_traces/lego_legacy.tar.gz.sha1 0 → 100644
2761d929ab61e51bc28cf4f9fab60bc4a641a4d7
\ No newline at end of file
src/tests/restricted_traces/restricted_traces.json
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
"fate_grand_order", "fate_grand_order",
"free_fire", "free_fire",
"kartrider_rush", "kartrider_rush",
"lego_legacy",
"manhattan_10", "manhattan_10",
"marvel_contest_of_champions", "marvel_contest_of_champions",
"mobile_legends", "mobile_legends",
......
src/tests/restricted_traces/restricted_traces_autogen.cpp
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "fate_grand_order/fate_grand_order_capture_context1.h" #include "fate_grand_order/fate_grand_order_capture_context1.h"
#include "free_fire/free_fire_capture_context1.h" #include "free_fire/free_fire_capture_context1.h"
#include "kartrider_rush/kartrider_rush_capture_context1.h" #include "kartrider_rush/kartrider_rush_capture_context1.h"
#include "lego_legacy/lego_legacy_capture_context2.h"
#include "manhattan_10/manhattan_10_capture_context1.h" #include "manhattan_10/manhattan_10_capture_context1.h"
#include "marvel_contest_of_champions/marvel_contest_of_champions_capture_context1.h" #include "marvel_contest_of_champions/marvel_contest_of_champions_capture_context1.h"
#include "mobile_legends/mobile_legends_capture_context1.h" #include "mobile_legends/mobile_legends_capture_context1.h"
...@@ -77,6 +78,9 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -77,6 +78,9 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{kartrider_rush::kReplayFrameStart, kartrider_rush::kReplayFrameEnd, {kartrider_rush::kReplayFrameStart, kartrider_rush::kReplayFrameEnd,
kartrider_rush::kReplayDrawSurfaceWidth, kartrider_rush::kReplayDrawSurfaceHeight, kartrider_rush::kReplayDrawSurfaceWidth, kartrider_rush::kReplayDrawSurfaceHeight,
"kartrider_rush"}}, "kartrider_rush"}},
{RestrictedTraceID::lego_legacy,
{lego_legacy::kReplayFrameStart, lego_legacy::kReplayFrameEnd,
lego_legacy::kReplayDrawSurfaceWidth, lego_legacy::kReplayDrawSurfaceHeight, "lego_legacy"}},
{RestrictedTraceID::manhattan_10, {RestrictedTraceID::manhattan_10,
{manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd, {manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd,
manhattan_10::kReplayDrawSurfaceWidth, manhattan_10::kReplayDrawSurfaceHeight, manhattan_10::kReplayDrawSurfaceWidth, manhattan_10::kReplayDrawSurfaceHeight,
...@@ -156,6 +160,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -156,6 +160,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::ReplayContext1Frame(frameIndex); kartrider_rush::ReplayContext1Frame(frameIndex);
break; break;
case RestrictedTraceID::lego_legacy:
lego_legacy::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::ReplayContext1Frame(frameIndex); manhattan_10::ReplayContext1Frame(frameIndex);
break; break;
...@@ -227,6 +234,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -227,6 +234,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::ResetContext1Replay(); kartrider_rush::ResetContext1Replay();
break; break;
case RestrictedTraceID::lego_legacy:
lego_legacy::ResetContext2Replay();
break;
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::ResetContext1Replay(); manhattan_10::ResetContext1Replay();
break; break;
...@@ -298,6 +308,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -298,6 +308,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::SetupContext1Replay(); kartrider_rush::SetupContext1Replay();
break; break;
case RestrictedTraceID::lego_legacy:
lego_legacy::SetupContext2Replay();
break;
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::SetupContext1Replay(); manhattan_10::SetupContext1Replay();
break; break;
...@@ -369,6 +382,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -369,6 +382,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::SetBinaryDataDir(dataDir); kartrider_rush::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::lego_legacy:
lego_legacy::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::SetBinaryDataDir(dataDir); manhattan_10::SetBinaryDataDir(dataDir);
break; break;
...@@ -440,6 +456,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -440,6 +456,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::SetBinaryDataDecompressCallback(callback); kartrider_rush::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::lego_legacy:
lego_legacy::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::SetBinaryDataDecompressCallback(callback); manhattan_10::SetBinaryDataDecompressCallback(callback);
break; break;
......
src/tests/restricted_traces/restricted_traces_autogen.gni
...@@ -20,6 +20,7 @@ angle_restricted_traces = [ ...@@ -20,6 +20,7 @@ angle_restricted_traces = [
"fate_grand_order 1", "fate_grand_order 1",
"free_fire 1", "free_fire 1",
"kartrider_rush 1", "kartrider_rush 1",
"lego_legacy 2",
"manhattan_10 1", "manhattan_10 1",
"marvel_contest_of_champions 1", "marvel_contest_of_champions 1",
"mobile_legends 1", "mobile_legends 1",
......
src/tests/restricted_traces/restricted_traces_autogen.h
...@@ -65,6 +65,7 @@ enum class RestrictedTraceID ...@@ -65,6 +65,7 @@ enum class RestrictedTraceID
fate_grand_order, fate_grand_order,
free_fire, free_fire,
kartrider_rush, kartrider_rush,
lego_legacy,
manhattan_10, manhattan_10,
marvel_contest_of_champions, marvel_contest_of_champions,
mobile_legends, mobile_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