Skip to content

A
angle
Commit 767af74e by Tim Van Patten Committed by Commit Bot
Options

Tests: Add World War Doh trace

Test: angle_perftests --gtest_filter=TracePerfTest.Run/*world_war_doh* Bug: angleproject:4048 Change-Id: I047ed1ccd06cd3707065fe8afed3ad7af5cd7dcc Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2606645 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 43366979
Showing with 46 additions and 10 deletions
scripts/code_generation_hashes/restricted_traces.json
{
"src/tests/restricted_traces/.gitignore":
"d744a2890f6bb9ad89829f819d17998b",
"86197b3c5733bea4b743355cf7117fe2",
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
"2b5d6505d6a8b6f3bbfbad2c8405a89d",
"src/tests/restricted_traces/arena_of_valor.tar.gz.sha1":
......@@ -44,13 +44,13 @@
"src/tests/restricted_traces/real_commando_secret_mission.tar.gz.sha1":
"4b484dd9c53a79100ec13b6f1c86040d",
"src/tests/restricted_traces/restricted_traces.json":
"a09f626ff8916a5a26c3eaf4772215f4",
"391c48a5701b9c3eb3e2636bc86b8f90",
"src/tests/restricted_traces/restricted_traces_autogen.cpp":
"05b2bfe90307ffd88db84a48d5648b69",
"c7ada0bd77b7549648770d51c1df982e",
"src/tests/restricted_traces/restricted_traces_autogen.gni":
"98b1a4f9722303a84e5d11ec384281ea",
"66b05e66d00988139e269fe2c0257480",
"src/tests/restricted_traces/restricted_traces_autogen.h":
"787eb5595b4ecbf6a5c772a8b0da07eb",
"1dee486589dfc619165c21d2d70073d3",
"src/tests/restricted_traces/temple_run_300.tar.gz.sha1":
"0a08ce3df88cb358ccac3ac63ba04955",
"src/tests/restricted_traces/trex_200.tar.gz.sha1":
......@@ -58,5 +58,7 @@
"src/tests/restricted_traces/whatsapp.tar.gz.sha1":
"7d36415d9cb26cef1107f33eebb4726a",
"src/tests/restricted_traces/world_of_tanks_blitz.tar.gz.sha1":
"6cba9bb8542b71443f107952faddbe64"
"6cba9bb8542b71443f107952faddbe64",
"src/tests/restricted_traces/world_war_doh.tar.gz.sha1":
"ac16fcec4e9514e8b4cc952f91f37f60"
}
\ No newline at end of file
src/tests/perf_tests/TracePerfTest.cpp
......@@ -284,6 +284,12 @@ TracePerfTest::TracePerfTest()
addExtensionPrerequisite("GL_EXT_shadow_samplers");
}
if (param.testID == RestrictedTraceID::world_war_doh)
{
// Linux+Nvidia doesn't support GL_KHR_texture_compression_astc_ldr (possibly others also)
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
}
// We already swap in TracePerfTest::drawBenchmark, no need to swap again in the harness.
disableTestHarnessSwap();
......
src/tests/restricted_traces/.gitignore
......@@ -45,4 +45,6 @@ trex_200/
whatsapp.tar.gz
whatsapp/
world_of_tanks_blitz.tar.gz
world_of_tanks_blitz/
\ No newline at end of file
world_of_tanks_blitz/
world_war_doh.tar.gz
world_war_doh/
\ No newline at end of file
src/tests/restricted_traces/restricted_traces.json
......@@ -30,6 +30,7 @@
"temple_run_300",
"trex_200",
"whatsapp",
"world_of_tanks_blitz"
"world_of_tanks_blitz",
"world_war_doh"
]
}
src/tests/restricted_traces/restricted_traces_autogen.cpp
......@@ -35,6 +35,7 @@
#include "trex_200/trex_200_capture_context1.h"
#include "whatsapp/whatsapp_capture_context1.h"
#include "world_of_tanks_blitz/world_of_tanks_blitz_capture_context1.h"
#include "world_war_doh/world_war_doh_capture_context2.h"
namespace angle
{
......@@ -127,7 +128,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{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"}}};
"world_of_tanks_blitz"}},
{RestrictedTraceID::world_war_doh,
{world_war_doh::kReplayFrameStart, world_war_doh::kReplayFrameEnd,
world_war_doh::kReplayDrawSurfaceWidth, world_war_doh::kReplayDrawSurfaceHeight,
"world_war_doh"}}};
}
const TraceInfo &GetTraceInfo(RestrictedTraceID traceID)
......@@ -211,6 +216,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::world_of_tanks_blitz:
world_of_tanks_blitz::ReplayContext1Frame(frameIndex);
break;
case RestrictedTraceID::world_war_doh:
world_war_doh::ReplayContext2Frame(frameIndex);
break;
default:
fprintf(stderr, "Error in switch.\n");
assert(0);
......@@ -294,6 +302,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::world_of_tanks_blitz:
world_of_tanks_blitz::ResetContext1Replay();
break;
case RestrictedTraceID::world_war_doh:
world_war_doh::ResetContext2Replay();
break;
default:
fprintf(stderr, "Error in switch.\n");
assert(0);
......@@ -377,6 +388,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::world_of_tanks_blitz:
world_of_tanks_blitz::SetupContext1Replay();
break;
case RestrictedTraceID::world_war_doh:
world_war_doh::SetupContext2Replay();
break;
default:
fprintf(stderr, "Error in switch.\n");
assert(0);
......@@ -460,6 +474,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::world_of_tanks_blitz:
world_of_tanks_blitz::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::world_war_doh:
world_war_doh::SetBinaryDataDir(dataDir);
break;
default:
fprintf(stderr, "Error in switch.\n");
assert(0);
......@@ -543,6 +560,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::world_of_tanks_blitz:
world_of_tanks_blitz::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::world_war_doh:
world_war_doh::SetBinaryDataDecompressCallback(callback);
break;
default:
fprintf(stderr, "Error in switch.\n");
assert(0);
......
src/tests/restricted_traces/restricted_traces_autogen.gni
......@@ -33,4 +33,5 @@ angle_restricted_traces = [
"trex_200 1",
"whatsapp 1",
"world_of_tanks_blitz 1",
"world_war_doh 2",
]
src/tests/restricted_traces/restricted_traces_autogen.h
......@@ -78,6 +78,7 @@ enum class RestrictedTraceID
trex_200,
whatsapp,
world_of_tanks_blitz,
world_war_doh,
InvalidEnum,
EnumCount = InvalidEnum
};
......
src/tests/restricted_traces/world_war_doh.tar.gz.sha1 0 → 100644
9ed0f6a4ed93ca192637cce887e4ea0aa1d2e9c8
\ 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