Skip to content

A
angle
Commit 14152cf4 by Cody Northrop Committed by Commit Bot
Options

Tests: Add Extreme Car Driving Simulator trace

Test: angle_perftests --gtest_filter="*extreme_car_driving_simulator*" TBR: jmadill@google.com, timvp@google.com Bug: b/180419767 Bug: angleproject:5735 Change-Id: I5c197a71354a0cb3b907718b7ae7161037f7266f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2743806Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent a70a6a9d
Showing with 42 additions and 5 deletions
scripts/code_generation_hashes/restricted_traces.json
{
"src/tests/restricted_traces/.gitignore":
"97d094f939508ea18d5b2c8f45e01785",
"b8258f89dc44e6ec67eda213285595f7",
"src/tests/restricted_traces/aliexpress.tar.gz.sha1":
"12f48ff0c4ca7980ea879c81b0c9518b",
"src/tests/restricted_traces/among_us.tar.gz.sha1":
......@@ -35,6 +35,8 @@
"0d569cbab0adf4df1027f671c65f7bff",
"src/tests/restricted_traces/eight_ball_pool.tar.gz.sha1":
"5826ab8ccdef774fbec4106ddef76720",
"src/tests/restricted_traces/extreme_car_driving_simulator.tar.gz.sha1":
"935f2d28778428e1c608d785f9a3664e",
"src/tests/restricted_traces/fallout_shelter_online.tar.gz.sha1":
"6f2784d375489b6d6f44092de1a859e0",
"src/tests/restricted_traces/fate_grand_order.tar.gz.sha1":
......@@ -88,13 +90,13 @@
"src/tests/restricted_traces/real_gangster_crime.tar.gz.sha1":
"c85be329035a760edad673eb2ca7c3f1",
"src/tests/restricted_traces/restricted_traces.json":
"e1d1b013f60fc9349d0f9190e7efa5b2",
"89efa0342ac35c3c9e9e24638ea9c28f",
"src/tests/restricted_traces/restricted_traces_autogen.cpp":
"8cda6f05df47a23e663ef1ce44f6ad3b",
"ea1ca2bdf1eb3e381e965562fe6903fe",
"src/tests/restricted_traces/restricted_traces_autogen.gni":
"7380c5d634735e54aebf3b7d968158b0",
"e73d4a44957e38f49dc217f2ad9de9a3",
"src/tests/restricted_traces/restricted_traces_autogen.h":
"d6c08b0e6e023c3132ed34bb154f3ec1",
"22e3ffdc20fa3cb5728b24db7935fa3b",
"src/tests/restricted_traces/rise_of_kingdoms.tar.gz.sha1":
"d4618f857c44f0dfa642ae3af8f161d9",
"src/tests/restricted_traces/romancing_saga.tar.gz.sha1":
......
src/tests/perf_tests/TracePerfTest.cpp
......@@ -408,6 +408,11 @@ TracePerfTest::TracePerfTest()
}
}
if (param.testID == RestrictedTraceID::extreme_car_driving_simulator)
{
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
......@@ -32,6 +32,8 @@ egypt_1500.tar.gz
egypt_1500/
eight_ball_pool.tar.gz
eight_ball_pool/
extreme_car_driving_simulator.tar.gz
extreme_car_driving_simulator/
fallout_shelter_online.tar.gz
fallout_shelter_online/
fate_grand_order.tar.gz
......
src/tests/restricted_traces/extreme_car_driving_simulator.tar.gz.sha1 0 → 100644
3640aa7efa16972968f4c5e71ddf76ea8d9681c2
\ No newline at end of file
src/tests/restricted_traces/restricted_traces.json
......@@ -24,6 +24,7 @@
"efootball_pes_2021",
"egypt_1500",
"eight_ball_pool",
"extreme_car_driving_simulator",
"fallout_shelter_online",
"fate_grand_order",
"fifa_mobile",
......
src/tests/restricted_traces/restricted_traces_autogen.cpp
......@@ -28,6 +28,7 @@
#include "efootball_pes_2021/efootball_pes_2021_capture_context7.h"
#include "egypt_1500/egypt_1500_capture_context1.h"
#include "eight_ball_pool/eight_ball_pool_capture_context2.h"
#include "extreme_car_driving_simulator/extreme_car_driving_simulator_capture_context3.h"
#include "fallout_shelter_online/fallout_shelter_online_capture_context3.h"
#include "fate_grand_order/fate_grand_order_capture_context1.h"
#include "fifa_mobile/fifa_mobile_capture_context2.h"
......@@ -155,6 +156,13 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
eight_ball_pool::kReplayContextClientMinorVersion, eight_ball_pool::kReplayFrameStart,
eight_ball_pool::kReplayFrameEnd, eight_ball_pool::kReplayDrawSurfaceWidth,
eight_ball_pool::kReplayDrawSurfaceHeight, "eight_ball_pool"}},
{RestrictedTraceID::extreme_car_driving_simulator,
{extreme_car_driving_simulator::kReplayContextClientMajorVersion,
extreme_car_driving_simulator::kReplayContextClientMinorVersion,
extreme_car_driving_simulator::kReplayFrameStart,
extreme_car_driving_simulator::kReplayFrameEnd,
extreme_car_driving_simulator::kReplayDrawSurfaceWidth,
extreme_car_driving_simulator::kReplayDrawSurfaceHeight, "extreme_car_driving_simulator"}},
{RestrictedTraceID::fallout_shelter_online,
{fallout_shelter_online::kReplayContextClientMajorVersion,
fallout_shelter_online::kReplayContextClientMinorVersion,
......@@ -412,6 +420,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::eight_ball_pool:
eight_ball_pool::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::extreme_car_driving_simulator:
extreme_car_driving_simulator::ReplayContext3Frame(frameIndex);
break;
case RestrictedTraceID::fallout_shelter_online:
fallout_shelter_online::ReplayContext3Frame(frameIndex);
break;
......@@ -597,6 +608,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::eight_ball_pool:
eight_ball_pool::ResetContext2Replay();
break;
case RestrictedTraceID::extreme_car_driving_simulator:
extreme_car_driving_simulator::ResetContext3Replay();
break;
case RestrictedTraceID::fallout_shelter_online:
fallout_shelter_online::ResetContext3Replay();
break;
......@@ -782,6 +796,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::eight_ball_pool:
eight_ball_pool::SetupContext2Replay();
break;
case RestrictedTraceID::extreme_car_driving_simulator:
extreme_car_driving_simulator::SetupContext3Replay();
break;
case RestrictedTraceID::fallout_shelter_online:
fallout_shelter_online::SetupContext3Replay();
break;
......@@ -967,6 +984,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::eight_ball_pool:
eight_ball_pool::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::extreme_car_driving_simulator:
extreme_car_driving_simulator::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::fallout_shelter_online:
fallout_shelter_online::SetBinaryDataDir(dataDir);
break;
......@@ -1152,6 +1172,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::eight_ball_pool:
eight_ball_pool::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::extreme_car_driving_simulator:
extreme_car_driving_simulator::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::fallout_shelter_online:
fallout_shelter_online::SetBinaryDataDecompressCallback(callback);
break;
......
src/tests/restricted_traces/restricted_traces_autogen.gni
......@@ -26,6 +26,7 @@ angle_restricted_traces = [
"efootball_pes_2021 7",
"egypt_1500 1",
"eight_ball_pool 2",
"extreme_car_driving_simulator 3",
"fallout_shelter_online 3",
"fate_grand_order 1",
"fifa_mobile 2",
......
src/tests/restricted_traces/restricted_traces_autogen.h
......@@ -71,6 +71,7 @@ enum class RestrictedTraceID
efootball_pes_2021,
egypt_1500,
eight_ball_pool,
extreme_car_driving_simulator,
fallout_shelter_online,
fate_grand_order,
fifa_mobile,
......
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