encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Statically link the dawn_end2end_tests 

This allows us to enable white_box tests that use Tint. It
fixes linking with symbols from both dawn_native statically
and dynamically.

Bug: dawn:696
Change-Id: I6a002ae5ec55a27b6bf7329c9ba301ce8014d521
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/43840
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
Austin Eng 2021-03-04 16:49:35 +00:00 committed by Commit Bot service account
parent 3b1a0c6e14
commit 6e62183aa5
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tests/BUILD.gn
View File

@ -264,7 +264,9 @@ source_set("dawn_end2end_tests_sources") {
"${dawn_root}/src/common",
"${dawn_root}/src/dawn:dawn_proc",
"${dawn_root}/src/dawn:dawncpp",
"${dawn_root}/src/dawn_native",
# Statically linked because the end2end white_box tests use Dawn internals.
"${dawn_root}/src/dawn_native:dawn_native_static",
"${dawn_root}/src/dawn_wire",
"${dawn_root}/src/utils:dawn_utils",
]
@ -390,12 +392,11 @@ source_set("dawn_white_box_tests_sources") {
"${dawn_root}/src/dawn:dawn_proc",
"${dawn_root}/src/dawn:dawncpp",
"${dawn_root}/src/dawn_native:dawn_native_sources",
# Statically linked because the end2end white_box tests use Dawn internals.
"${dawn_root}/src/dawn_native:dawn_native_static",
"${dawn_root}/src/dawn_wire",
"${dawn_root}/src/utils:dawn_utils",
# Static because the tests both link against and have dawn_native
# sources. MSVC errors when both importing and exporting symbols.
"${dawn_root}/src/dawn_native:dawn_native_static",
]
sources = [ "DawnTest.h" ]
@ -448,7 +449,7 @@ test("dawn_end2end_tests") {
"${dawn_root}/src/common",
"${dawn_root}/src/dawn:dawn_proc",
"${dawn_root}/src/dawn:dawncpp",
"${dawn_root}/src/dawn_native",
"${dawn_root}/src/dawn_native:dawn_native_static",
"${dawn_root}/src/dawn_wire",
"${dawn_root}/src/utils:dawn_utils",
]

3
src/tests/white_box/QueryInternalShaderTests.cpp
View File

@ -88,9 +88,6 @@ class QueryInternalShaderTests : public DawnTest {};
TEST_P(QueryInternalShaderTests, TimestampComputeShader) {
DAWN_SKIP_TEST_IF(UsesWire());
// TODO(bclayton): DLL symbol linker issue?
DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator") && IsWindows());
constexpr uint32_t kTimestampCount = 10u;
// A gpu frequency on Intel D3D12 (ticks/second)
constexpr uint64_t kGPUFrequency = 12000048u;

2
src/utils/BUILD.gn
View File

@ -88,7 +88,7 @@ static_library("dawn_utils") {
deps = [
"${dawn_root}/src/common",
"${dawn_root}/src/dawn:dawn_proc",
"${dawn_root}/src/dawn_native",
"${dawn_root}/src/dawn_native:dawn_native_headers",
"${dawn_root}/src/dawn_wire",
"${dawn_shaderc_dir}:libshaderc",
]