Commit 258f17d6 by Cody Northrop Committed by Commit Bot

Tests: Add World of Tanks Blitz trace

Test: angle_perftests --gtest_filter="*world_of_tanks_blitz*" Bug: b/171446929 Change-Id: I028bfde50baa583f1ff7bf30ad77fe40026c7ca7 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2495486 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 9e3eec54
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"975053b988efba09342bbc967b8cbb76", "8296662ca72909d8f7e050ec8325d48d",
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1": "src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
"44fc5437c4a84012e338b3da4b6fc28a", "44fc5437c4a84012e338b3da4b6fc28a",
"src/tests/restricted_traces/arena_of_valor.tar.gz.sha1": "src/tests/restricted_traces/arena_of_valor.tar.gz.sha1":
...@@ -28,15 +28,17 @@ ...@@ -28,15 +28,17 @@
"src/tests/restricted_traces/nba2k20_800.tar.gz.sha1": "src/tests/restricted_traces/nba2k20_800.tar.gz.sha1":
"03df0dcf41c18bc59edfc0b088ca4a87", "03df0dcf41c18bc59edfc0b088ca4a87",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"964d9d30361aae731f495562ed373b79", "bbfc95bf0db20a314b8d79fdd1cbc65b",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"8d82249c50da7d734fb71e11f2829d90", "92dab041f28cec16d31d79c742193fad",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"2367de2be057b3b3b7bbd3e89053b0f2", "5882a52348a45b1701161af20ee55336",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"7601e1f0c3806fa2ff203788906762b1", "9ce9ba8a785cded6688635a48cfb97c3",
"src/tests/restricted_traces/temple_run_300.tar.gz.sha1": "src/tests/restricted_traces/temple_run_300.tar.gz.sha1":
"77475b0186ee0380eeb9db47433d0457", "77475b0186ee0380eeb9db47433d0457",
"src/tests/restricted_traces/trex_200.tar.gz.sha1": "src/tests/restricted_traces/trex_200.tar.gz.sha1":
"ca2d91a527f4a4317f944afc96c35268" "ca2d91a527f4a4317f944afc96c35268",
"src/tests/restricted_traces/world_of_tanks_blitz.tar.gz.sha1":
"c72106f9999f5eff8916a0c699072687"
} }
\ No newline at end of file
...@@ -250,6 +250,11 @@ TracePerfTest::TracePerfTest() ...@@ -250,6 +250,11 @@ TracePerfTest::TracePerfTest()
addExtensionPrerequisite("GL_EXT_color_buffer_half_float"); addExtensionPrerequisite("GL_EXT_color_buffer_half_float");
} }
if (param.testID == RestrictedTraceID::world_of_tanks_blitz)
{
addExtensionPrerequisite("EXT_disjoint_timer_query");
}
// 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();
......
...@@ -25,4 +25,6 @@ nba2k20_800/ ...@@ -25,4 +25,6 @@ nba2k20_800/
temple_run_300.tar.gz temple_run_300.tar.gz
temple_run_300/ temple_run_300/
trex_200.tar.gz trex_200.tar.gz
trex_200/ trex_200/
\ No newline at end of file world_of_tanks_blitz.tar.gz
world_of_tanks_blitz/
\ No newline at end of file
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"mobile_legends", "mobile_legends",
"nba2k20_800", "nba2k20_800",
"temple_run_300", "temple_run_300",
"trex_200" "trex_200",
"world_of_tanks_blitz"
] ]
} }
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "nba2k20_800/nba2k20_800_capture_context1.h" #include "nba2k20_800/nba2k20_800_capture_context1.h"
#include "temple_run_300/temple_run_300_capture_context1.h" #include "temple_run_300/temple_run_300_capture_context1.h"
#include "trex_200/trex_200_capture_context6.h" #include "trex_200/trex_200_capture_context6.h"
#include "world_of_tanks_blitz/world_of_tanks_blitz_capture_context3.h"
namespace angle namespace angle
{ {
...@@ -80,7 +81,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -80,7 +81,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
"temple_run_300"}}, "temple_run_300"}},
{RestrictedTraceID::trex_200, {RestrictedTraceID::trex_200,
{trex_200::kReplayFrameStart, trex_200::kReplayFrameEnd, trex_200::kReplayDrawSurfaceWidth, {trex_200::kReplayFrameStart, trex_200::kReplayFrameEnd, trex_200::kReplayDrawSurfaceWidth,
trex_200::kReplayDrawSurfaceHeight, "trex_200"}}}; trex_200::kReplayDrawSurfaceHeight, "trex_200"}},
{RestrictedTraceID::world_of_tanks_blitz,
{world_of_tanks_blitz::kReplayFrameStart, world_of_tanks_blitz::kReplayFrameEnd,
world_of_tanks_blitz::kReplayDrawSurfaceWidth, world_of_tanks_blitz::kReplayDrawSurfaceHeight,
"world_of_tanks_blitz"}}};
} }
const TraceInfo &GetTraceInfo(RestrictedTraceID traceID) const TraceInfo &GetTraceInfo(RestrictedTraceID traceID)
...@@ -134,6 +139,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -134,6 +139,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::trex_200: case RestrictedTraceID::trex_200:
trex_200::ReplayContext6Frame(frameIndex); trex_200::ReplayContext6Frame(frameIndex);
break; break;
case RestrictedTraceID::world_of_tanks_blitz:
world_of_tanks_blitz::ReplayContext3Frame(frameIndex);
break;
default: default:
fprintf(stderr, "Error in switch.\n"); fprintf(stderr, "Error in switch.\n");
assert(0); assert(0);
...@@ -187,6 +195,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -187,6 +195,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::trex_200: case RestrictedTraceID::trex_200:
trex_200::ResetContext6Replay(); trex_200::ResetContext6Replay();
break; break;
case RestrictedTraceID::world_of_tanks_blitz:
world_of_tanks_blitz::ResetContext3Replay();
break;
default: default:
fprintf(stderr, "Error in switch.\n"); fprintf(stderr, "Error in switch.\n");
assert(0); assert(0);
...@@ -240,6 +251,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -240,6 +251,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::trex_200: case RestrictedTraceID::trex_200:
trex_200::SetupContext6Replay(); trex_200::SetupContext6Replay();
break; break;
case RestrictedTraceID::world_of_tanks_blitz:
world_of_tanks_blitz::SetupContext3Replay();
break;
default: default:
fprintf(stderr, "Error in switch.\n"); fprintf(stderr, "Error in switch.\n");
assert(0); assert(0);
...@@ -293,6 +307,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -293,6 +307,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::trex_200: case RestrictedTraceID::trex_200:
trex_200::SetBinaryDataDir(dataDir); trex_200::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::world_of_tanks_blitz:
world_of_tanks_blitz::SetBinaryDataDir(dataDir);
break;
default: default:
fprintf(stderr, "Error in switch.\n"); fprintf(stderr, "Error in switch.\n");
assert(0); assert(0);
...@@ -346,6 +363,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -346,6 +363,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::trex_200: case RestrictedTraceID::trex_200:
trex_200::SetBinaryDataDecompressCallback(callback); trex_200::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::world_of_tanks_blitz:
world_of_tanks_blitz::SetBinaryDataDecompressCallback(callback);
break;
default: default:
fprintf(stderr, "Error in switch.\n"); fprintf(stderr, "Error in switch.\n");
assert(0); assert(0);
......
...@@ -23,4 +23,5 @@ angle_restricted_traces = [ ...@@ -23,4 +23,5 @@ angle_restricted_traces = [
"nba2k20_800 1", "nba2k20_800 1",
"temple_run_300 1", "temple_run_300 1",
"trex_200 6", "trex_200 6",
"world_of_tanks_blitz 3",
] ]
...@@ -54,6 +54,7 @@ enum class RestrictedTraceID ...@@ -54,6 +54,7 @@ enum class RestrictedTraceID
nba2k20_800, nba2k20_800,
temple_run_300, temple_run_300,
trex_200, trex_200,
world_of_tanks_blitz,
InvalidEnum, InvalidEnum,
EnumCount = InvalidEnum EnumCount = InvalidEnum
}; };
......
be94262d5afa360adc927c65c6e2ccd8102c6468
\ 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