encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-05-16 20:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove explicit test instantiation with use_tint_generator

Browse Source 
We're migrating to run all tests with both Tint and SPIRV-Cross.
Remove explicitly instantiating only with Tint, and add
skips for tests that will not work if use_tint_generator is not
enabled.

Bug: dawn:571
Change-Id: I8322dec688e75b6efa8c4f18c6b9439a2e325631
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/56261
Auto-Submit: Austin Eng <enga@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
This commit is contained in:
Austin Eng 2021-06-28 21:18:40 +00:00 committed by Dawn LUCI CQ
parent 0db69f0052
commit 27b0162b96
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp
View File

@ -132,7 +132,13 @@ std::ostream& operator<<(std::ostream& o, Field field) {
DAWN_TEST_PARAM_STRUCT(ComputeLayoutMemoryBufferTestParams, StorageClass, Field) DAWN_TEST_PARAM_STRUCT(ComputeLayoutMemoryBufferTestParams, StorageClass, Field)
class ComputeLayoutMemoryBufferTests class ComputeLayoutMemoryBufferTests
: public DawnTestWithParams<ComputeLayoutMemoryBufferTestParams> {}; : public DawnTestWithParams<ComputeLayoutMemoryBufferTestParams> {
void SetUp() override {
DawnTestBase::SetUp();
DAWN_TEST_UNSUPPORTED_IF((IsD3D12() || IsMetal()) &&
!HasToggleEnabled("use_tint_generator"));
}
};
TEST_P(ComputeLayoutMemoryBufferTests, Fields) { TEST_P(ComputeLayoutMemoryBufferTests, Fields) {
// Sentinel value markers codes used to check that the start and end of // Sentinel value markers codes used to check that the start and end of
@ -342,8 +348,7 @@ namespace {
auto GenerateParams() { auto GenerateParams() {
auto params = MakeParamGenerator<ComputeLayoutMemoryBufferTestParams>( auto params = MakeParamGenerator<ComputeLayoutMemoryBufferTestParams>(
{ {
D3D12Backend({"use_tint_generator"}), MetalBackend({"use_tint_generator"}), D3D12Backend(), MetalBackend(), VulkanBackend(),
VulkanBackend(),
// TODO(crbug.com/dawn/942) // TODO(crbug.com/dawn/942)
// There was a compiler error: Buffer block cannot be expressed as any of std430, // There was a compiler error: Buffer block cannot be expressed as any of std430,
// std140, scalar, even with enhanced layouts. You can try flattening this block to // std140, scalar, even with enhanced layouts. You can try flattening this block to

3
src/tests/end2end/FirstIndexOffsetTests.cpp
View File

@ -48,6 +48,7 @@ class FirstIndexOffsetTests : public DawnTest {
protected: protected:
void SetUp() override { void SetUp() override {
DawnTest::SetUp(); DawnTest::SetUp();
DAWN_TEST_UNSUPPORTED_IF(IsD3D12() && !HasToggleEnabled("use_tint_generator"));
// WGSL doesn't have the ability to tag attributes as "flat". "flat" is required on u32 // WGSL doesn't have the ability to tag attributes as "flat". "flat" is required on u32
// attributes for correct runtime behavior under Vulkan and codegen under OpenGL(ES). // attributes for correct runtime behavior under Vulkan and codegen under OpenGL(ES).
@ -219,7 +220,7 @@ TEST_P(FirstIndexOffsetTests, IndexedBothOffset) {
} }
DAWN_INSTANTIATE_TEST(FirstIndexOffsetTests, DAWN_INSTANTIATE_TEST(FirstIndexOffsetTests,
D3D12Backend({"use_tint_generator"}), D3D12Backend(),
MetalBackend(), MetalBackend(),
OpenGLBackend(), OpenGLBackend(),
OpenGLESBackend(), OpenGLESBackend(),