Commit 3c3b82ab by Cody Northrop Committed by Commit Bot

Tests: Add Hearthstone trace

Test: angle_perftests --gtest_filter="*hearthstone*" Bug: angleproject:5571 Change-Id: Idc6535bbf817cd62d34aa9e684604be068455520 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2644143 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarTim Van Patten <timvp@google.com>
parent c51c3548
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"f8059af893e2a0b624722c1c0a4264d3", "2b88beb1ea3d9f8c32d92301d0d39487",
"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":
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
"eccb9514e9606eb56b24cf57598e596c", "eccb9514e9606eb56b24cf57598e596c",
"src/tests/restricted_traces/google_maps.tar.gz.sha1": "src/tests/restricted_traces/google_maps.tar.gz.sha1":
"5d7001969619570e80e5a39b1ab8b0c4", "5d7001969619570e80e5a39b1ab8b0c4",
"src/tests/restricted_traces/hearthstone.tar.gz.sha1":
"73fa97c4ab9be39017725c219666e908",
"src/tests/restricted_traces/kartrider_rush.tar.gz.sha1": "src/tests/restricted_traces/kartrider_rush.tar.gz.sha1":
"c11aab56dcaba570a1993c1f8ebe4668", "c11aab56dcaba570a1993c1f8ebe4668",
"src/tests/restricted_traces/klondike_adventures.tar.gz.sha1": "src/tests/restricted_traces/klondike_adventures.tar.gz.sha1":
...@@ -52,13 +54,13 @@ ...@@ -52,13 +54,13 @@
"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":
"46234fd8f771915a64937e1f2b4565ce", "69c868aa1179eccb4a3b9cd85f7552de",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"41a9f85175b75c074cb25a2e5e0d1b2d", "b14f88349570527ec5a1f443697a609b",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"21cce03e456b86caf80be379c09f1497", "6ed5ba1223842ae4ef7ec6e8bfff007d",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"7a2f1393f2d909a707c61bfeecb62653", "583333e4b40a9aea9ef30218223f3a90",
"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/subway_surfers.tar.gz.sha1": "src/tests/restricted_traces/subway_surfers.tar.gz.sha1":
......
...@@ -318,6 +318,11 @@ TracePerfTest::TracePerfTest() ...@@ -318,6 +318,11 @@ TracePerfTest::TracePerfTest()
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr"); addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
} }
if (param.testID == RestrictedTraceID::hearthstone)
{
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();
......
...@@ -24,6 +24,8 @@ free_fire.tar.gz ...@@ -24,6 +24,8 @@ free_fire.tar.gz
free_fire/ free_fire/
google_maps.tar.gz google_maps.tar.gz
google_maps/ google_maps/
hearthstone.tar.gz
hearthstone/
kartrider_rush.tar.gz kartrider_rush.tar.gz
kartrider_rush/ kartrider_rush/
klondike_adventures.tar.gz klondike_adventures.tar.gz
......
09fe5baf075a9a2a26b86f170d7f4dffceb544cd
\ No newline at end of file
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"fifa_mobile", "fifa_mobile",
"free_fire", "free_fire",
"google_maps", "google_maps",
"hearthstone",
"kartrider_rush", "kartrider_rush",
"klondike_adventures", "klondike_adventures",
"lego_legacy", "lego_legacy",
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "fifa_mobile/fifa_mobile_capture_context2.h" #include "fifa_mobile/fifa_mobile_capture_context2.h"
#include "free_fire/free_fire_capture_context1.h" #include "free_fire/free_fire_capture_context1.h"
#include "google_maps/google_maps_capture_context3.h" #include "google_maps/google_maps_capture_context3.h"
#include "hearthstone/hearthstone_capture_context2.h"
#include "kartrider_rush/kartrider_rush_capture_context1.h" #include "kartrider_rush/kartrider_rush_capture_context1.h"
#include "klondike_adventures/klondike_adventures_capture_context2.h" #include "klondike_adventures/klondike_adventures_capture_context2.h"
#include "lego_legacy/lego_legacy_capture_context2.h" #include "lego_legacy/lego_legacy_capture_context2.h"
...@@ -93,6 +94,9 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -93,6 +94,9 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{RestrictedTraceID::google_maps, {RestrictedTraceID::google_maps,
{google_maps::kReplayFrameStart, google_maps::kReplayFrameEnd, {google_maps::kReplayFrameStart, google_maps::kReplayFrameEnd,
google_maps::kReplayDrawSurfaceWidth, google_maps::kReplayDrawSurfaceHeight, "google_maps"}}, google_maps::kReplayDrawSurfaceWidth, google_maps::kReplayDrawSurfaceHeight, "google_maps"}},
{RestrictedTraceID::hearthstone,
{hearthstone::kReplayFrameStart, hearthstone::kReplayFrameEnd,
hearthstone::kReplayDrawSurfaceWidth, hearthstone::kReplayDrawSurfaceHeight, "hearthstone"}},
{RestrictedTraceID::kartrider_rush, {RestrictedTraceID::kartrider_rush,
{kartrider_rush::kReplayFrameStart, kartrider_rush::kReplayFrameEnd, {kartrider_rush::kReplayFrameStart, kartrider_rush::kReplayFrameEnd,
kartrider_rush::kReplayDrawSurfaceWidth, kartrider_rush::kReplayDrawSurfaceHeight, kartrider_rush::kReplayDrawSurfaceWidth, kartrider_rush::kReplayDrawSurfaceHeight,
...@@ -212,6 +216,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -212,6 +216,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::google_maps: case RestrictedTraceID::google_maps:
google_maps::ReplayContext3Frame(frameIndex); google_maps::ReplayContext3Frame(frameIndex);
break; break;
case RestrictedTraceID::hearthstone:
hearthstone::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::ReplayContext1Frame(frameIndex); kartrider_rush::ReplayContext1Frame(frameIndex);
break; break;
...@@ -316,6 +323,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -316,6 +323,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::google_maps: case RestrictedTraceID::google_maps:
google_maps::ResetContext3Replay(); google_maps::ResetContext3Replay();
break; break;
case RestrictedTraceID::hearthstone:
hearthstone::ResetContext2Replay();
break;
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::ResetContext1Replay(); kartrider_rush::ResetContext1Replay();
break; break;
...@@ -420,6 +430,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -420,6 +430,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::google_maps: case RestrictedTraceID::google_maps:
google_maps::SetupContext3Replay(); google_maps::SetupContext3Replay();
break; break;
case RestrictedTraceID::hearthstone:
hearthstone::SetupContext2Replay();
break;
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::SetupContext1Replay(); kartrider_rush::SetupContext1Replay();
break; break;
...@@ -524,6 +537,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -524,6 +537,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::google_maps: case RestrictedTraceID::google_maps:
google_maps::SetBinaryDataDir(dataDir); google_maps::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::hearthstone:
hearthstone::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::SetBinaryDataDir(dataDir); kartrider_rush::SetBinaryDataDir(dataDir);
break; break;
...@@ -628,6 +644,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -628,6 +644,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::google_maps: case RestrictedTraceID::google_maps:
google_maps::SetBinaryDataDecompressCallback(callback); google_maps::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::hearthstone:
hearthstone::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::kartrider_rush: case RestrictedTraceID::kartrider_rush:
kartrider_rush::SetBinaryDataDecompressCallback(callback); kartrider_rush::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -22,6 +22,7 @@ angle_restricted_traces = [ ...@@ -22,6 +22,7 @@ angle_restricted_traces = [
"fifa_mobile 2", "fifa_mobile 2",
"free_fire 1", "free_fire 1",
"google_maps 3", "google_maps 3",
"hearthstone 2",
"kartrider_rush 1", "kartrider_rush 1",
"klondike_adventures 2", "klondike_adventures 2",
"lego_legacy 2", "lego_legacy 2",
......
...@@ -67,6 +67,7 @@ enum class RestrictedTraceID ...@@ -67,6 +67,7 @@ enum class RestrictedTraceID
fifa_mobile, fifa_mobile,
free_fire, free_fire,
google_maps, google_maps,
hearthstone,
kartrider_rush, kartrider_rush,
klondike_adventures, klondike_adventures,
lego_legacy, lego_legacy,
......
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