From cef7dcbf52dbe11bc420de3a099c677cc349f609 Mon Sep 17 00:00:00 2001 From: Roman Lavrov Date: Tue, 11 Apr 2023 16:12:12 -0400 Subject: [PATCH] Trace Interpreter: support harry_potter_hogwarts_mystery Handling of calls like: glGetBooleanv(GL_DEPTH_WRITEMASK, (GLboolean *)gReadBuffer); glGetFloatv(GL_DEPTH_CLEAR_VALUE, (GLfloat *)gReadBuffer); Add interpreted test to CI. Bug: b/276742336 Change-Id: Iae3ff9035044461ca1a208980c170d5d48d1a424 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4416166 Commit-Queue: Roman Lavrov Reviewed-by: Cody Northrop --- infra/specs/angle.json | 8 ++++---- infra/specs/test_suites.pyl | 2 +- scripts/code_generation_hashes/Test_spec_JSON.json | 4 ++-- util/capture/trace_interpreter.cpp | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/infra/specs/angle.json b/infra/specs/angle.json index 1635abbbb..cbecf72ea 100644 --- a/infra/specs/angle.json +++ b/infra/specs/angle.json @@ -1592,7 +1592,7 @@ "args": [ "--log=debug", "interpret", - "among_us:dota_underlords:genshin_impact:manhattan_10:trex_200", + "among_us:dota_underlords:genshin_impact:harry_potter_hogwarts_mystery:manhattan_10:trex_200", "-L=2", "--show-test-stdout" ], @@ -2397,7 +2397,7 @@ "args": [ "--log=debug", "interpret", - "among_us:dota_underlords:genshin_impact:manhattan_10:trex_200", + "among_us:dota_underlords:genshin_impact:harry_potter_hogwarts_mystery:manhattan_10:trex_200", "-L=2", "--show-test-stdout" ], @@ -4585,7 +4585,7 @@ "args": [ "--log=debug", "interpret", - "among_us:dota_underlords:genshin_impact:manhattan_10:trex_200", + "among_us:dota_underlords:genshin_impact:harry_potter_hogwarts_mystery:manhattan_10:trex_200", "-L=2", "--show-test-stdout" ], @@ -5498,7 +5498,7 @@ "args": [ "--log=debug", "interpret", - "among_us:dota_underlords:genshin_impact:manhattan_10:trex_200", + "among_us:dota_underlords:genshin_impact:harry_potter_hogwarts_mystery:manhattan_10:trex_200", "-L=2", "--show-test-stdout" ], diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl index 0a656a5f5..16c7cd530 100644 --- a/infra/specs/test_suites.pyl +++ b/infra/specs/test_suites.pyl @@ -759,7 +759,7 @@ 'args': [ '--log=debug', 'interpret', - 'among_us:dota_underlords:genshin_impact:manhattan_10:trex_200', + 'among_us:dota_underlords:genshin_impact:harry_potter_hogwarts_mystery:manhattan_10:trex_200', '-L=2', '--show-test-stdout', ], diff --git a/scripts/code_generation_hashes/Test_spec_JSON.json b/scripts/code_generation_hashes/Test_spec_JSON.json index 6cf098903..ab64581bc 100644 --- a/scripts/code_generation_hashes/Test_spec_JSON.json +++ b/scripts/code_generation_hashes/Test_spec_JSON.json @@ -1,6 +1,6 @@ { "infra/specs/angle.json": - "1373decca1845cf0539a5625154f59f0", + "19911457e1aac36fcccf542bd82d8ca9", "infra/specs/generate_test_spec_json.py": "b8dbb50c814b7fe05eb77cf6e376cee4", "infra/specs/mixins.pyl": @@ -8,7 +8,7 @@ "infra/specs/test_suite_exceptions.pyl": "55886f8b6ae4122306ce42083c5126c7", "infra/specs/test_suites.pyl": - "486592b3a5e9829df1364a3be4999062", + "9918603ab011f608dae0551061d4a313", "infra/specs/variants.pyl": "8cfcaa99fa07ad2a2d5d14f220fd5037", "infra/specs/waterfalls.pyl": diff --git a/util/capture/trace_interpreter.cpp b/util/capture/trace_interpreter.cpp index 940ef5a7f..56d08066b 100644 --- a/util/capture/trace_interpreter.cpp +++ b/util/capture/trace_interpreter.cpp @@ -739,7 +739,7 @@ void PackParameter(ParamBuffer ¶ms, const Token &token, const Trace template <> void PackParameter(ParamBuffer ¶ms, const Token &token, const TraceStringMap &strings) { - UNREACHABLE(); + PackMutablePointerParameter(params, ParamType::TGLfloatPointer, token); } template <> @@ -845,7 +845,7 @@ void PackParameter(ParamBuffer ¶ms, const Token &token, const TraceStringMap &strings) { - UNREACHABLE(); + PackMutablePointerParameter(params, ParamType::TGLubytePointer, token); } template <>