Commit 4e8a848d by Cody Northrop Committed by Commit Bot

Tests: Add Shadow Fight 2 trace

TBR: jmadill@google.com,timvp@google.com Test: angle_perftests --gtest_filter="*shadow_fight_2*" Bug: angleproject:5610 Change-Id: I80c6c44e19d77124096ed5970f99fbb6157bf03b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2674482Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent fff0a72e
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"8f3f8c4f166920c30a576dcf69b2b737", "1d7df1edbfb0ccec7a5ef63d167fd50a",
"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":
...@@ -68,15 +68,17 @@ ...@@ -68,15 +68,17 @@
"src/tests/restricted_traces/real_gangster_crime.tar.gz.sha1": "src/tests/restricted_traces/real_gangster_crime.tar.gz.sha1":
"c85be329035a760edad673eb2ca7c3f1", "c85be329035a760edad673eb2ca7c3f1",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"bd018600f0668ce15c35004093594d97", "31d3aca1e36cfa8b8b86a7068875743e",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"8d2b50a5117edf518030ac68375cb862", "874a557b0f0fe10a7acbff5dfdc35778",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"7bf0ba6638e7e0a29b68861808511862", "63c1d2d02d7196357780fa7421f4992c",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"9e9d72d45609d8fe07d735602e73f365", "fe91c1d3973c02eca4a5c09e0f58bccc",
"src/tests/restricted_traces/saint_seiya_awakening.tar.gz.sha1": "src/tests/restricted_traces/saint_seiya_awakening.tar.gz.sha1":
"c9cde6bdfd9096a44d5f03d905a45a4f", "c9cde6bdfd9096a44d5f03d905a45a4f",
"src/tests/restricted_traces/shadow_fight_2.tar.gz.sha1":
"f8490221b74d0186b86a3d9e2b37b97d",
"src/tests/restricted_traces/subway_surfers.tar.gz.sha1": "src/tests/restricted_traces/subway_surfers.tar.gz.sha1":
"647775e4cd6bc9969b69463c2ad99a39", "647775e4cd6bc9969b69463c2ad99a39",
"src/tests/restricted_traces/temple_run_2.tar.gz.sha1": "src/tests/restricted_traces/temple_run_2.tar.gz.sha1":
......
...@@ -343,6 +343,12 @@ TracePerfTest::TracePerfTest() ...@@ -343,6 +343,12 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::shadow_fight_2)
{
addExtensionPrerequisite("GL_OES_EGL_image_external");
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
}
// 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();
......
...@@ -64,6 +64,8 @@ real_gangster_crime.tar.gz ...@@ -64,6 +64,8 @@ real_gangster_crime.tar.gz
real_gangster_crime/ real_gangster_crime/
saint_seiya_awakening.tar.gz saint_seiya_awakening.tar.gz
saint_seiya_awakening/ saint_seiya_awakening/
shadow_fight_2.tar.gz
shadow_fight_2/
subway_surfers.tar.gz subway_surfers.tar.gz
subway_surfers/ subway_surfers/
temple_run_2.tar.gz temple_run_2.tar.gz
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
"real_commando_secret_mission", "real_commando_secret_mission",
"real_gangster_crime", "real_gangster_crime",
"saint_seiya_awakening", "saint_seiya_awakening",
"shadow_fight_2",
"subway_surfers", "subway_surfers",
"temple_run_2", "temple_run_2",
"temple_run_300", "temple_run_300",
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include "real_commando_secret_mission/real_commando_secret_mission_capture_context1.h" #include "real_commando_secret_mission/real_commando_secret_mission_capture_context1.h"
#include "real_gangster_crime/real_gangster_crime_capture_context3.h" #include "real_gangster_crime/real_gangster_crime_capture_context3.h"
#include "saint_seiya_awakening/saint_seiya_awakening_capture_context2.h" #include "saint_seiya_awakening/saint_seiya_awakening_capture_context2.h"
#include "shadow_fight_2/shadow_fight_2_capture_context2.h"
#include "subway_surfers/subway_surfers_capture_context2.h" #include "subway_surfers/subway_surfers_capture_context2.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"
...@@ -178,6 +179,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -178,6 +179,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{saint_seiya_awakening::kReplayFrameStart, saint_seiya_awakening::kReplayFrameEnd, {saint_seiya_awakening::kReplayFrameStart, saint_seiya_awakening::kReplayFrameEnd,
saint_seiya_awakening::kReplayDrawSurfaceWidth, saint_seiya_awakening::kReplayDrawSurfaceWidth,
saint_seiya_awakening::kReplayDrawSurfaceHeight, "saint_seiya_awakening"}}, saint_seiya_awakening::kReplayDrawSurfaceHeight, "saint_seiya_awakening"}},
{RestrictedTraceID::shadow_fight_2,
{shadow_fight_2::kReplayFrameStart, shadow_fight_2::kReplayFrameEnd,
shadow_fight_2::kReplayDrawSurfaceWidth, shadow_fight_2::kReplayDrawSurfaceHeight,
"shadow_fight_2"}},
{RestrictedTraceID::subway_surfers, {RestrictedTraceID::subway_surfers,
{subway_surfers::kReplayFrameStart, subway_surfers::kReplayFrameEnd, {subway_surfers::kReplayFrameStart, subway_surfers::kReplayFrameEnd,
subway_surfers::kReplayDrawSurfaceWidth, subway_surfers::kReplayDrawSurfaceHeight, subway_surfers::kReplayDrawSurfaceWidth, subway_surfers::kReplayDrawSurfaceHeight,
...@@ -314,6 +319,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -314,6 +319,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::ReplayContext2Frame(frameIndex); saint_seiya_awakening::ReplayContext2Frame(frameIndex);
break; break;
case RestrictedTraceID::shadow_fight_2:
shadow_fight_2::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::subway_surfers: case RestrictedTraceID::subway_surfers:
subway_surfers::ReplayContext2Frame(frameIndex); subway_surfers::ReplayContext2Frame(frameIndex);
break; break;
...@@ -445,6 +453,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -445,6 +453,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::ResetContext2Replay(); saint_seiya_awakening::ResetContext2Replay();
break; break;
case RestrictedTraceID::shadow_fight_2:
shadow_fight_2::ResetContext2Replay();
break;
case RestrictedTraceID::subway_surfers: case RestrictedTraceID::subway_surfers:
subway_surfers::ResetContext2Replay(); subway_surfers::ResetContext2Replay();
break; break;
...@@ -576,6 +587,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -576,6 +587,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::SetupContext2Replay(); saint_seiya_awakening::SetupContext2Replay();
break; break;
case RestrictedTraceID::shadow_fight_2:
shadow_fight_2::SetupContext2Replay();
break;
case RestrictedTraceID::subway_surfers: case RestrictedTraceID::subway_surfers:
subway_surfers::SetupContext2Replay(); subway_surfers::SetupContext2Replay();
break; break;
...@@ -707,6 +721,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -707,6 +721,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::SetBinaryDataDir(dataDir); saint_seiya_awakening::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::shadow_fight_2:
shadow_fight_2::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::subway_surfers: case RestrictedTraceID::subway_surfers:
subway_surfers::SetBinaryDataDir(dataDir); subway_surfers::SetBinaryDataDir(dataDir);
break; break;
...@@ -838,6 +855,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -838,6 +855,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::SetBinaryDataDecompressCallback(callback); saint_seiya_awakening::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::shadow_fight_2:
shadow_fight_2::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::subway_surfers: case RestrictedTraceID::subway_surfers:
subway_surfers::SetBinaryDataDecompressCallback(callback); subway_surfers::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -42,6 +42,7 @@ angle_restricted_traces = [ ...@@ -42,6 +42,7 @@ angle_restricted_traces = [
"real_commando_secret_mission 1", "real_commando_secret_mission 1",
"real_gangster_crime 3", "real_gangster_crime 3",
"saint_seiya_awakening 2", "saint_seiya_awakening 2",
"shadow_fight_2 2",
"subway_surfers 2", "subway_surfers 2",
"temple_run_2 1", "temple_run_2 1",
"temple_run_300 1", "temple_run_300 1",
......
...@@ -87,6 +87,7 @@ enum class RestrictedTraceID ...@@ -87,6 +87,7 @@ enum class RestrictedTraceID
real_commando_secret_mission, real_commando_secret_mission,
real_gangster_crime, real_gangster_crime,
saint_seiya_awakening, saint_seiya_awakening,
shadow_fight_2,
subway_surfers, subway_surfers,
temple_run_2, temple_run_2,
temple_run_300, temple_run_300,
......
fff620629e58e58866d6670f3083388cc44a9d2a
\ No newline at end of file
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