From 34d52ffa4c3a4767b1f3ef38cb9c1f5a7a0bdfb7 Mon Sep 17 00:00:00 2001 From: Peng Huang Date: Thu, 13 Apr 2023 22:45:28 +0000 Subject: [PATCH] Revert "d3d11: add d3d11 backend in end2end tests" This reverts commit 3fcf96dd8c262c69029a47ce6ad85314fcd3d69b. Reason for revert: want to enable end2end test piece by piece on bots for d3d11 Original change's description: > d3d11: add d3d11 backend in end2end tests > > Right now, many tests are not passed becasue unimplemented > features in d3d11 backend. HoweverD3D11 backend is disabled on > bots by default, so this CL will not break out bots. > > Bug: dawn:1705 > Change-Id: I57321b86a404bc245b71c467479fdee0464dee9b > Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/126260 > Commit-Queue: Peng Huang > Reviewed-by: Austin Eng > Kokoro: Kokoro Bug: dawn:1705 Change-Id: I95a1cc9a0962b01a6b31ea32b6129f109f4b3e42 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/127240 Kokoro: Kokoro Reviewed-by: Austin Eng Commit-Queue: Peng Huang --- src/dawn/tests/AdapterTestConfig.cpp | 8 ---- src/dawn/tests/AdapterTestConfig.h | 3 -- src/dawn/tests/DawnTest.cpp | 16 +++----- src/dawn/tests/DawnTest.h | 1 - src/dawn/tests/end2end/BasicTests.cpp | 1 - src/dawn/tests/end2end/BindGroupTests.cpp | 25 ++++++------ src/dawn/tests/end2end/BufferTests.cpp | 10 +---- src/dawn/tests/end2end/ClipSpaceTests.cpp | 1 - src/dawn/tests/end2end/ColorStateTests.cpp | 1 - .../tests/end2end/CommandEncoderTests.cpp | 1 - .../end2end/CompressedTextureFormatTests.cpp | 9 ++--- .../end2end/ComputeCopyStorageBufferTests.cpp | 1 - .../tests/end2end/ComputeDispatchTests.cpp | 1 - .../tests/end2end/ComputeFlowControlTests.cpp | 1 - .../ComputeLayoutMemoryBufferTests.cpp | 1 - .../end2end/ComputeSharedMemoryTests.cpp | 1 - .../ComputeStorageBufferBarrierTests.cpp | 1 - .../CopyExternalTextureForBrowserTests.cpp | 3 +- src/dawn/tests/end2end/CopyTests.cpp | 16 +++----- .../end2end/CopyTextureForBrowserTests.cpp | 39 +++++++++---------- .../end2end/CreatePipelineAsyncTests.cpp | 1 - src/dawn/tests/end2end/CullingTests.cpp | 1 - src/dawn/tests/end2end/DepthBiasTests.cpp | 1 - .../tests/end2end/DepthStencilCopyTests.cpp | 10 ++--- .../tests/end2end/DepthStencilLoadOpTests.cpp | 17 ++++---- .../end2end/DepthStencilSamplingTests.cpp | 10 ++--- .../tests/end2end/DepthStencilStateTests.cpp | 1 - src/dawn/tests/end2end/DestroyTests.cpp | 1 - .../tests/end2end/DeviceLifetimeTests.cpp | 1 - src/dawn/tests/end2end/DeviceLostTests.cpp | 1 - .../end2end/DrawIndexedIndirectTests.cpp | 1 - src/dawn/tests/end2end/DrawIndexedTests.cpp | 1 - src/dawn/tests/end2end/DrawIndirectTests.cpp | 1 - src/dawn/tests/end2end/DrawTests.cpp | 1 - .../end2end/DynamicBufferOffsetTests.cpp | 1 - src/dawn/tests/end2end/EntryPointTests.cpp | 1 - .../tests/end2end/FirstIndexOffsetTests.cpp | 1 - src/dawn/tests/end2end/FragDepthTests.cpp | 1 - .../end2end/GpuMemorySynchronizationTests.cpp | 3 -- src/dawn/tests/end2end/IndexFormatTests.cpp | 3 -- src/dawn/tests/end2end/MaxLimitTests.cpp | 1 - .../end2end/MemoryAllocationStressTests.cpp | 1 - .../end2end/MultisampledRenderingTests.cpp | 1 - .../end2end/MultisampledSamplingTests.cpp | 1 - src/dawn/tests/end2end/MultithreadTests.cpp | 7 +--- src/dawn/tests/end2end/ObjectCachingTests.cpp | 1 - src/dawn/tests/end2end/OpArrayLengthTests.cpp | 1 - .../tests/end2end/PipelineCachingTests.cpp | 1 - .../tests/end2end/PipelineLayoutTests.cpp | 1 - .../tests/end2end/PrimitiveStateTests.cpp | 1 - .../tests/end2end/PrimitiveTopologyTests.cpp | 1 - src/dawn/tests/end2end/QueryTests.cpp | 4 -- src/dawn/tests/end2end/QueueTests.cpp | 3 -- src/dawn/tests/end2end/QueueTimelineTests.cpp | 1 - .../ReadOnlyDepthStencilAttachmentTests.cpp | 10 ++--- .../tests/end2end/RenderAttachmentTests.cpp | 1 - src/dawn/tests/end2end/RenderBundleTests.cpp | 1 - .../tests/end2end/RenderPassLoadOpTests.cpp | 1 - src/dawn/tests/end2end/RenderPassTests.cpp | 3 -- .../end2end/RequiredBufferSizeInCopyTests.cpp | 5 +-- .../end2end/SamplerFilterAnisotropicTests.cpp | 1 - src/dawn/tests/end2end/SamplerTests.cpp | 1 - src/dawn/tests/end2end/ScissorTests.cpp | 1 - src/dawn/tests/end2end/ShaderF16Tests.cpp | 1 - src/dawn/tests/end2end/ShaderTests.cpp | 1 - .../tests/end2end/ShaderValidationTests.cpp | 1 - .../tests/end2end/StorageTextureTests.cpp | 2 - .../SubresourceRenderAttachmentTests.cpp | 1 - src/dawn/tests/end2end/Texture3DTests.cpp | 1 - src/dawn/tests/end2end/TextureFormatTests.cpp | 1 - .../tests/end2end/TextureSubresourceTests.cpp | 1 - src/dawn/tests/end2end/TextureViewTests.cpp | 5 --- src/dawn/tests/end2end/VertexFormatTests.cpp | 1 - .../end2end/VertexOnlyRenderPipelineTests.cpp | 2 - src/dawn/tests/end2end/VertexStateTests.cpp | 2 - .../end2end/ViewportOrientationTests.cpp | 1 - src/dawn/tests/end2end/ViewportTests.cpp | 1 - .../tests/perf_tests/BufferUploadPerf.cpp | 3 +- src/dawn/tests/perf_tests/DrawCallPerf.cpp | 2 +- .../tests/perf_tests/ShaderRobustnessPerf.cpp | 3 +- .../perf_tests/SubresourceTrackingPerf.cpp | 3 +- .../white_box/BufferAllocatedSizeTests.cpp | 8 +--- .../InternalStorageBufferBindingTests.cpp | 1 - .../white_box/QueryInternalShaderTests.cpp | 6 +-- 84 files changed, 78 insertions(+), 216 deletions(-) diff --git a/src/dawn/tests/AdapterTestConfig.cpp b/src/dawn/tests/AdapterTestConfig.cpp index e81bb295f8..454b9b1495 100644 --- a/src/dawn/tests/AdapterTestConfig.cpp +++ b/src/dawn/tests/AdapterTestConfig.cpp @@ -29,12 +29,6 @@ BackendTestConfig::BackendTestConfig(wgpu::BackendType backendType, forceEnabledWorkarounds(forceEnabledWorkarounds), forceDisabledWorkarounds(forceDisabledWorkarounds) {} -BackendTestConfig D3D11Backend(std::initializer_list forceEnabledWorkarounds, - std::initializer_list forceDisabledWorkarounds) { - return BackendTestConfig(wgpu::BackendType::D3D11, forceEnabledWorkarounds, - forceDisabledWorkarounds); -} - BackendTestConfig D3D12Backend(std::initializer_list forceEnabledWorkarounds, std::initializer_list forceDisabledWorkarounds) { return BackendTestConfig(wgpu::BackendType::D3D12, forceEnabledWorkarounds, @@ -77,8 +71,6 @@ TestAdapterProperties::TestAdapterProperties(const wgpu::AdapterProperties& prop std::string TestAdapterProperties::ParamName() const { switch (backendType) { - case wgpu::BackendType::D3D11: - return "D3D11"; case wgpu::BackendType::D3D12: return "D3D12"; case wgpu::BackendType::Metal: diff --git a/src/dawn/tests/AdapterTestConfig.h b/src/dawn/tests/AdapterTestConfig.h index 22735598f6..2e978ec673 100644 --- a/src/dawn/tests/AdapterTestConfig.h +++ b/src/dawn/tests/AdapterTestConfig.h @@ -59,9 +59,6 @@ struct AdapterTestParam { std::ostream& operator<<(std::ostream& os, const AdapterTestParam& param); -BackendTestConfig D3D11Backend(std::initializer_list forceEnabledWorkarounds = {}, - std::initializer_list forceDisabledWorkarounds = {}); - BackendTestConfig D3D12Backend(std::initializer_list forceEnabledWorkarounds = {}, std::initializer_list forceDisabledWorkarounds = {}); diff --git a/src/dawn/tests/DawnTest.cpp b/src/dawn/tests/DawnTest.cpp index c5aefc24ed..18ee1601aa 100644 --- a/src/dawn/tests/DawnTest.cpp +++ b/src/dawn/tests/DawnTest.cpp @@ -299,9 +299,7 @@ void DawnTestEnvironment::ParseArgs(int argc, char** argv) { argLen = sizeof(kBackendArg) - 1; if (strncmp(argv[i], kBackendArg, argLen) == 0) { const char* param = argv[i] + argLen; - if (strcmp("d3d11", param) == 0) { - mBackendTypeFilter = wgpu::BackendType::D3D11; - } else if (strcmp("d3d12", param) == 0) { + if (strcmp("d3d12", param) == 0) { mBackendTypeFilter = wgpu::BackendType::D3D12; } else if (strcmp("metal", param) == 0) { mBackendTypeFilter = wgpu::BackendType::Metal; @@ -722,9 +720,9 @@ DawnTestBase::~DawnTestBase() { mAdapter = nullptr; mInstance = nullptr; - // D3D11 and D3D12's GPU-based validation will accumulate objects over time if the backend - // device is not destroyed and recreated, so we reset it here. - if ((IsD3D11() || IsD3D12()) && IsBackendValidationEnabled()) { + // D3D12's GPU-based validation will accumulate objects over time if the backend device is not + // destroyed and recreated, so we reset it here. + if (IsD3D12() && IsBackendValidationEnabled()) { mBackendAdapter.ResetInternalDeviceForTesting(); } mWireHelper.reset(); @@ -735,10 +733,6 @@ DawnTestBase::~DawnTestBase() { gCurrentTest = nullptr; } -bool DawnTestBase::IsD3D11() const { - return mParam.adapterProperties.backendType == wgpu::BackendType::D3D11; -} - bool DawnTestBase::IsD3D12() const { return mParam.adapterProperties.backendType == wgpu::BackendType::D3D12; } @@ -1566,7 +1560,7 @@ void DawnTestBase::SlotMapCallback(WGPUBufferMapAsyncStatus status, void* userda void DawnTestBase::ResolveExpectations() { for (const auto& expectation : mDeferredExpectations) { - EXPECT_TRUE(mReadbackSlots[expectation.readbackSlot].mappedData != nullptr); + DAWN_ASSERT(mReadbackSlots[expectation.readbackSlot].mappedData != nullptr); // Get a pointer to the mapped copy of the data for the expectation. const char* data = diff --git a/src/dawn/tests/DawnTest.h b/src/dawn/tests/DawnTest.h index 259995e7ad..0b7eddd167 100644 --- a/src/dawn/tests/DawnTest.h +++ b/src/dawn/tests/DawnTest.h @@ -224,7 +224,6 @@ class DawnTestBase { void SetUp(); void TearDown(); - bool IsD3D11() const; bool IsD3D12() const; bool IsMetal() const; bool IsNull() const; diff --git a/src/dawn/tests/end2end/BasicTests.cpp b/src/dawn/tests/end2end/BasicTests.cpp index 04eed0bc0a..4193fc2f25 100644 --- a/src/dawn/tests/end2end/BasicTests.cpp +++ b/src/dawn/tests/end2end/BasicTests.cpp @@ -59,7 +59,6 @@ TEST_P(BasicTests, QueueWriteBufferError) { } DAWN_INSTANTIATE_TEST(BasicTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/BindGroupTests.cpp b/src/dawn/tests/end2end/BindGroupTests.cpp index 41bccacef0..2117c2e0a7 100644 --- a/src/dawn/tests/end2end/BindGroupTests.cpp +++ b/src/dawn/tests/end2end/BindGroupTests.cpp @@ -170,6 +170,7 @@ TEST_P(BindGroupTests, ReusedUBO) { struct VertexUniformBuffer { transform : vec4f } + @group(0) @binding(0) var vertexUbo : VertexUniformBuffer; @vertex @@ -189,8 +190,7 @@ TEST_P(BindGroupTests, ReusedUBO) { } @group(0) @binding(1) var fragmentUbo : FragmentUniformBuffer; - @fragment - fn main() -> @location(0) vec4f { + @fragment fn main() -> @location(0) vec4f { return fragmentUbo.color; })"); @@ -203,17 +203,20 @@ TEST_P(BindGroupTests, ReusedUBO) { struct Data { float transform[8]; - char padding[256 - sizeof(transform)]; + char padding[256 - 8 * sizeof(float)]; float color[4]; }; - Data data{{1.f, 0.f, 0.f, 1.0f}, {0}, {0.f, 1.f, 0.f, 1.f}}; + ASSERT(offsetof(Data, color) == 256); + Data data{ + {1.f, 0.f, 0.f, 1.0f}, + {0}, + {0.f, 1.f, 0.f, 1.f}, + }; wgpu::Buffer buffer = utils::CreateBufferFromData(device, &data, sizeof(data), wgpu::BufferUsage::Uniform); - - wgpu::BindGroup bindGroup = - utils::MakeBindGroup(device, pipeline.GetBindGroupLayout(0), - {{0, buffer, offsetof(Data, transform), sizeof(Data::transform)}, - {1, buffer, offsetof(Data, color), sizeof(Data::color)}}); + wgpu::BindGroup bindGroup = utils::MakeBindGroup( + device, pipeline.GetBindGroupLayout(0), + {{0, buffer, 0, sizeof(Data::transform)}, {1, buffer, 256, sizeof(Data::color)}}); wgpu::CommandEncoder encoder = device.CreateCommandEncoder(); wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&renderPass.renderPassInfo); @@ -989,9 +992,6 @@ TEST_P(BindGroupTests, DrawThenChangePipelineTwiceAndBindGroup) { // Regression test for crbug.com/dawn/408 where dynamic offsets were applied in the wrong order. // Dynamic offsets should be applied in increasing order of binding number. TEST_P(BindGroupTests, DynamicOffsetOrder) { - // D3D11 doesn't support partial updates of dynamic uniform buffers. - DAWN_SUPPRESS_TEST_IF(IsD3D11()); - // We will put the following values and the respective offsets into a buffer. // The test will ensure that the correct dynamic offset is applied to each buffer by reading the // value from an offset binding. @@ -1507,7 +1507,6 @@ TEST_P(BindGroupTests, CreateWithDestroyedResource) { } DAWN_INSTANTIATE_TEST(BindGroupTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/BufferTests.cpp b/src/dawn/tests/end2end/BufferTests.cpp index a8af96097d..98a96a73b5 100644 --- a/src/dawn/tests/end2end/BufferTests.cpp +++ b/src/dawn/tests/end2end/BufferTests.cpp @@ -553,7 +553,6 @@ TEST_P(BufferMappingTests, RegressChromium1421170) { } DAWN_INSTANTIATE_TEST(BufferMappingTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -714,11 +713,7 @@ TEST_P(BufferMappingCallbackTests, EmptySubmissionWriteAndThenMap) { buffer.Unmap(); } -DAWN_INSTANTIATE_TEST(BufferMappingCallbackTests, - D3D11Backend(), - D3D12Backend(), - MetalBackend(), - VulkanBackend()); +DAWN_INSTANTIATE_TEST(BufferMappingCallbackTests, D3D12Backend(), MetalBackend(), VulkanBackend()); class BufferMappedAtCreationTests : public DawnTest { protected: @@ -966,7 +961,6 @@ TEST_P(BufferMappedAtCreationTests, GetMappedRangeZeroSized) { } DAWN_INSTANTIATE_TEST(BufferMappedAtCreationTests, - D3D11Backend(), D3D12Backend(), D3D12Backend({}, {"use_d3d12_resource_heap_tier2"}), MetalBackend(), @@ -1114,7 +1108,6 @@ TEST_P(BufferTests, CreateBufferOOMMapAsync) { } DAWN_INSTANTIATE_TEST(BufferTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -1147,7 +1140,6 @@ TEST_P(BufferNoSuballocationTests, WriteBufferThenDestroy) { } DAWN_INSTANTIATE_TEST(BufferNoSuballocationTests, - D3D11Backend({"disable_resource_suballocation"}), D3D12Backend({"disable_resource_suballocation"}), MetalBackend({"disable_resource_suballocation"}), OpenGLBackend({"disable_resource_suballocation"}), diff --git a/src/dawn/tests/end2end/ClipSpaceTests.cpp b/src/dawn/tests/end2end/ClipSpaceTests.cpp index 5f8c07e02a..ca0fa35bf0 100644 --- a/src/dawn/tests/end2end/ClipSpaceTests.cpp +++ b/src/dawn/tests/end2end/ClipSpaceTests.cpp @@ -93,7 +93,6 @@ TEST_P(ClipSpaceTest, ClipSpace) { } DAWN_INSTANTIATE_TEST(ClipSpaceTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/ColorStateTests.cpp b/src/dawn/tests/end2end/ColorStateTests.cpp index c5e35b144f..0216eaebfb 100644 --- a/src/dawn/tests/end2end/ColorStateTests.cpp +++ b/src/dawn/tests/end2end/ColorStateTests.cpp @@ -1189,7 +1189,6 @@ TEST_P(ColorStateTest, SrcBlendFactorDstAlphaDstBlendFactorZero) { } DAWN_INSTANTIATE_TEST(ColorStateTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/CommandEncoderTests.cpp b/src/dawn/tests/end2end/CommandEncoderTests.cpp index 14f227e7a7..00d99c56d3 100644 --- a/src/dawn/tests/end2end/CommandEncoderTests.cpp +++ b/src/dawn/tests/end2end/CommandEncoderTests.cpp @@ -46,7 +46,6 @@ TEST_P(CommandEncoderTests, WriteBuffer) { } DAWN_INSTANTIATE_TEST(CommandEncoderTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/CompressedTextureFormatTests.cpp b/src/dawn/tests/end2end/CompressedTextureFormatTests.cpp index 3ecd54df0b..e0650c4f3e 100644 --- a/src/dawn/tests/end2end/CompressedTextureFormatTests.cpp +++ b/src/dawn/tests/end2end/CompressedTextureFormatTests.cpp @@ -1121,8 +1121,8 @@ TEST_P(CompressedTextureFormatTest, CopyMultiple2DArrayLayers) { } DAWN_INSTANTIATE_TEST_P(CompressedTextureFormatTest, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend(), + {D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), + VulkanBackend(), VulkanBackend({"use_temporary_buffer_in_texture_to_texture_copy"})}, std::vector(utils::kCompressedFormats.begin(), utils::kCompressedFormats.end())); @@ -1177,7 +1177,6 @@ TEST_P(CompressedTextureFormatSpecificTest, BC1RGBAUnorm_UnalignedDynamicUploade } DAWN_INSTANTIATE_TEST(CompressedTextureFormatSpecificTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -1305,7 +1304,7 @@ TEST_P(CompressedTextureWriteTextureTest, } DAWN_INSTANTIATE_TEST_P(CompressedTextureWriteTextureTest, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()}, + {D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), + VulkanBackend()}, std::vector(utils::kCompressedFormats.begin(), utils::kCompressedFormats.end())); diff --git a/src/dawn/tests/end2end/ComputeCopyStorageBufferTests.cpp b/src/dawn/tests/end2end/ComputeCopyStorageBufferTests.cpp index 4cd8fe56a2..b4bd836fc5 100644 --- a/src/dawn/tests/end2end/ComputeCopyStorageBufferTests.cpp +++ b/src/dawn/tests/end2end/ComputeCopyStorageBufferTests.cpp @@ -145,7 +145,6 @@ TEST_P(ComputeCopyStorageBufferTests, UnsizedArrayOfBasic) { } DAWN_INSTANTIATE_TEST(ComputeCopyStorageBufferTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/ComputeDispatchTests.cpp b/src/dawn/tests/end2end/ComputeDispatchTests.cpp index 693062651f..23555a5a46 100644 --- a/src/dawn/tests/end2end/ComputeDispatchTests.cpp +++ b/src/dawn/tests/end2end/ComputeDispatchTests.cpp @@ -311,7 +311,6 @@ TEST_P(ComputeDispatchTests, ExceedsMaxWorkgroupsWithOffsetNoop) { } DAWN_INSTANTIATE_TEST(ComputeDispatchTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/ComputeFlowControlTests.cpp b/src/dawn/tests/end2end/ComputeFlowControlTests.cpp index 6c22093898..933ffafe10 100644 --- a/src/dawn/tests/end2end/ComputeFlowControlTests.cpp +++ b/src/dawn/tests/end2end/ComputeFlowControlTests.cpp @@ -500,7 +500,6 @@ fn main() { } DAWN_INSTANTIATE_TEST(ComputeFlowControlTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/ComputeLayoutMemoryBufferTests.cpp b/src/dawn/tests/end2end/ComputeLayoutMemoryBufferTests.cpp index 897f1dd603..734d82c361 100644 --- a/src/dawn/tests/end2end/ComputeLayoutMemoryBufferTests.cpp +++ b/src/dawn/tests/end2end/ComputeLayoutMemoryBufferTests.cpp @@ -778,7 +778,6 @@ fn main() { auto GenerateParams() { auto params = MakeParamGenerator( { - D3D11Backend(), D3D12Backend(), D3D12Backend({"use_dxc"}), MetalBackend(), diff --git a/src/dawn/tests/end2end/ComputeSharedMemoryTests.cpp b/src/dawn/tests/end2end/ComputeSharedMemoryTests.cpp index 57ad5b6118..e3955176b6 100644 --- a/src/dawn/tests/end2end/ComputeSharedMemoryTests.cpp +++ b/src/dawn/tests/end2end/ComputeSharedMemoryTests.cpp @@ -197,7 +197,6 @@ TEST_P(ComputeSharedMemoryTests, AssortedTypes) { } DAWN_INSTANTIATE_TEST(ComputeSharedMemoryTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/ComputeStorageBufferBarrierTests.cpp b/src/dawn/tests/end2end/ComputeStorageBufferBarrierTests.cpp index e9af8582fc..4dbaf7321a 100644 --- a/src/dawn/tests/end2end/ComputeStorageBufferBarrierTests.cpp +++ b/src/dawn/tests/end2end/ComputeStorageBufferBarrierTests.cpp @@ -409,7 +409,6 @@ TEST_P(ComputeStorageBufferBarrierTests, IndirectBufferCorrectBarrier) { } DAWN_INSTANTIATE_TEST(ComputeStorageBufferBarrierTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/CopyExternalTextureForBrowserTests.cpp b/src/dawn/tests/end2end/CopyExternalTextureForBrowserTests.cpp index b2ec4428b0..f27bb27a16 100644 --- a/src/dawn/tests/end2end/CopyExternalTextureForBrowserTests.cpp +++ b/src/dawn/tests/end2end/CopyExternalTextureForBrowserTests.cpp @@ -378,8 +378,7 @@ TEST_P(CopyExternalTextureForBrowserTests_Basic, Copy) { DAWN_INSTANTIATE_TEST_P( CopyExternalTextureForBrowserTests_Basic, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), - VulkanBackend()}, + {D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, std::vector({CopyRect::TopLeft, CopyRect::TopRight, CopyRect::BottomLeft, CopyRect::BottomRight, CopyRect::FullSize}), std::vector({CopyRect::TopLeft, CopyRect::TopRight, CopyRect::BottomLeft, diff --git a/src/dawn/tests/end2end/CopyTests.cpp b/src/dawn/tests/end2end/CopyTests.cpp index 285096aada..8aaabc3dc9 100644 --- a/src/dawn/tests/end2end/CopyTests.cpp +++ b/src/dawn/tests/end2end/CopyTests.cpp @@ -1353,7 +1353,6 @@ TEST_P(CopyTests_T2B, Texture3DMipUnaligned) { } DAWN_INSTANTIATE_TEST(CopyTests_T2B, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -1947,7 +1946,6 @@ TEST_P(CopyTests_B2T, Texture3DMipUnaligned) { } DAWN_INSTANTIATE_TEST(CopyTests_B2T, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -2448,7 +2446,7 @@ TEST_P(CopyTests_T2T, Texture3DMipUnaligned) { DAWN_INSTANTIATE_TEST_P( CopyTests_T2T, - {D3D11Backend(), D3D12Backend(), + {D3D12Backend(), D3D12Backend({"use_temp_buffer_in_small_format_texture_to_texture_copy_from_greater_to_less_" "mip_level"}), D3D12Backend( @@ -2472,8 +2470,8 @@ TEST_P(CopyTests_Formats, SrgbCompatibility) { } DAWN_INSTANTIATE_TEST_P(CopyTests_Formats, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()}, + {D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), + VulkanBackend()}, {wgpu::TextureFormat::RGBA8Unorm, wgpu::TextureFormat::RGBA8UnormSrgb, wgpu::TextureFormat::BGRA8Unorm, wgpu::TextureFormat::BGRA8UnormSrgb}); @@ -2504,7 +2502,6 @@ TEST_P(CopyTests_B2B, ZeroSizedCopy) { } DAWN_INSTANTIATE_TEST(CopyTests_B2B, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -2533,7 +2530,6 @@ TEST_P(ClearBufferTests, ZeroSizedClear) { } DAWN_INSTANTIATE_TEST(ClearBufferTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -2716,9 +2712,8 @@ TEST_P(CopyToDepthStencilTextureAfterDestroyingBigBufferTests, DoTest) { DAWN_INSTANTIATE_TEST_P( CopyToDepthStencilTextureAfterDestroyingBigBufferTests, - {D3D11Backend(), D3D12Backend(), - D3D12Backend({"d3d12_force_clear_copyable_depth_stencil_texture_on_creation"}), MetalBackend(), - OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, + {D3D12Backend(), D3D12Backend({"d3d12_force_clear_copyable_depth_stencil_texture_on_creation"}), + MetalBackend(), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, {wgpu::TextureFormat::Depth16Unorm, wgpu::TextureFormat::Stencil8}, {InitializationMethod::CopyBufferToTexture, InitializationMethod::WriteTexture, InitializationMethod::CopyTextureToTexture}, @@ -2916,7 +2911,6 @@ TEST_P(T2TCopyFromDirtyHeapTests, From2DMultiMipmapLevelTexture) { } DAWN_INSTANTIATE_TEST(T2TCopyFromDirtyHeapTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/CopyTextureForBrowserTests.cpp b/src/dawn/tests/end2end/CopyTextureForBrowserTests.cpp index e458f2f1b2..d1d1d7717a 100644 --- a/src/dawn/tests/end2end/CopyTextureForBrowserTests.cpp +++ b/src/dawn/tests/end2end/CopyTextureForBrowserTests.cpp @@ -1116,7 +1116,6 @@ TEST_P(CopyTextureForBrowser_Basic, VerifyFlipYInSlimTexture) { } DAWN_INSTANTIATE_TEST(CopyTextureForBrowser_Basic, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -1138,20 +1137,19 @@ TEST_P(CopyTextureForBrowser_Formats, ColorConversion) { DoColorConversionTest(); } -DAWN_INSTANTIATE_TEST_P(CopyTextureForBrowser_Formats, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()}, - std::vector({wgpu::TextureFormat::RGBA8Unorm, - wgpu::TextureFormat::BGRA8Unorm, - wgpu::TextureFormat::RGBA16Float}), - std::vector( - {wgpu::TextureFormat::R8Unorm, wgpu::TextureFormat::R16Float, - wgpu::TextureFormat::R32Float, wgpu::TextureFormat::RG8Unorm, - wgpu::TextureFormat::RG16Float, wgpu::TextureFormat::RG32Float, - wgpu::TextureFormat::RGBA8Unorm, wgpu::TextureFormat::RGBA8UnormSrgb, - wgpu::TextureFormat::BGRA8Unorm, wgpu::TextureFormat::BGRA8UnormSrgb, - wgpu::TextureFormat::RGB10A2Unorm, wgpu::TextureFormat::RGBA16Float, - wgpu::TextureFormat::RGBA32Float})); +DAWN_INSTANTIATE_TEST_P( + CopyTextureForBrowser_Formats, + {D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, + std::vector({wgpu::TextureFormat::RGBA8Unorm, + wgpu::TextureFormat::BGRA8Unorm, + wgpu::TextureFormat::RGBA16Float}), + std::vector( + {wgpu::TextureFormat::R8Unorm, wgpu::TextureFormat::R16Float, wgpu::TextureFormat::R32Float, + wgpu::TextureFormat::RG8Unorm, wgpu::TextureFormat::RG16Float, + wgpu::TextureFormat::RG32Float, wgpu::TextureFormat::RGBA8Unorm, + wgpu::TextureFormat::RGBA8UnormSrgb, wgpu::TextureFormat::BGRA8Unorm, + wgpu::TextureFormat::BGRA8UnormSrgb, wgpu::TextureFormat::RGB10A2Unorm, + wgpu::TextureFormat::RGBA16Float, wgpu::TextureFormat::RGBA32Float})); // Verify |CopyTextureForBrowser| doing subrect copy. // Source texture is a full red texture and dst texture is a full @@ -1172,8 +1170,8 @@ TEST_P(CopyTextureForBrowser_SubRects, CopySubRect) { } DAWN_INSTANTIATE_TEST_P(CopyTextureForBrowser_SubRects, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()}, + {D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), + VulkanBackend()}, std::vector({{1, 1}, {1, 2}, {2, 1}}), std::vector({{1, 1}, {1, 2}, {2, 1}}), std::vector({{1, 1}, {2, 1}, {1, 2}, {2, 2}}), @@ -1196,8 +1194,7 @@ TEST_P(CopyTextureForBrowser_AlphaMode, alphaMode) { DAWN_INSTANTIATE_TEST_P( CopyTextureForBrowser_AlphaMode, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), - VulkanBackend()}, + {D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, std::vector({wgpu::AlphaMode::Premultiplied, wgpu::AlphaMode::Unpremultiplied, wgpu::AlphaMode::Opaque}), std::vector({wgpu::AlphaMode::Premultiplied, wgpu::AlphaMode::Unpremultiplied, @@ -1216,8 +1213,8 @@ TEST_P(CopyTextureForBrowser_ColorSpace, colorSpaceConversion) { } DAWN_INSTANTIATE_TEST_P(CopyTextureForBrowser_ColorSpace, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()}, + {D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), + VulkanBackend()}, std::vector({wgpu::TextureFormat::RGBA16Float, wgpu::TextureFormat::RGBA32Float}), std::vector({ColorSpace::SRGB, ColorSpace::DisplayP3}), diff --git a/src/dawn/tests/end2end/CreatePipelineAsyncTests.cpp b/src/dawn/tests/end2end/CreatePipelineAsyncTests.cpp index 5d945be8a2..627d3b28d4 100644 --- a/src/dawn/tests/end2end/CreatePipelineAsyncTests.cpp +++ b/src/dawn/tests/end2end/CreatePipelineAsyncTests.cpp @@ -955,7 +955,6 @@ TEST_P(CreatePipelineAsyncTest, CreateRenderPipelineAsyncWithBlendState) { } DAWN_INSTANTIATE_TEST(CreatePipelineAsyncTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/CullingTests.cpp b/src/dawn/tests/end2end/CullingTests.cpp index 47d30cc490..368046631b 100644 --- a/src/dawn/tests/end2end/CullingTests.cpp +++ b/src/dawn/tests/end2end/CullingTests.cpp @@ -127,7 +127,6 @@ TEST_P(CullingTest, CullBackFaceWhenCWIsFrontFace) { } DAWN_INSTANTIATE_TEST(CullingTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/DepthBiasTests.cpp b/src/dawn/tests/end2end/DepthBiasTests.cpp index 78538c11f6..5ad2919815 100644 --- a/src/dawn/tests/end2end/DepthBiasTests.cpp +++ b/src/dawn/tests/end2end/DepthBiasTests.cpp @@ -390,7 +390,6 @@ TEST_P(DepthBiasTests, PositiveSlopeBiasOn24bit) { } DAWN_INSTANTIATE_TEST(DepthBiasTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/DepthStencilCopyTests.cpp b/src/dawn/tests/end2end/DepthStencilCopyTests.cpp index 5b440e385a..37d04cb305 100644 --- a/src/dawn/tests/end2end/DepthStencilCopyTests.cpp +++ b/src/dawn/tests/end2end/DepthStencilCopyTests.cpp @@ -1040,7 +1040,7 @@ TEST_P(DepthStencilCopyTests_RegressionDawn1083, Run) { DAWN_INSTANTIATE_TEST_P( DepthStencilCopyTests, - {D3D11Backend(), D3D12Backend(), MetalBackend(), + {D3D12Backend(), MetalBackend(), MetalBackend({"use_blit_for_depth_texture_to_texture_copy_to_nonzero_subresource"}), MetalBackend({"use_blit_for_buffer_to_depth_texture_copy", "use_blit_for_buffer_to_stencil_texture_copy"}), @@ -1052,7 +1052,7 @@ DAWN_INSTANTIATE_TEST_P( DAWN_INSTANTIATE_TEST_P( DepthCopyTests, - {D3D11Backend(), D3D12Backend(), + {D3D12Backend(), D3D12Backend({"d3d12_use_temp_buffer_in_depth_stencil_texture_and_buffer_" "copy_with_non_zero_buffer_offset"}), MetalBackend(), @@ -1062,7 +1062,7 @@ DAWN_INSTANTIATE_TEST_P( kValidDepthCopyTextureFormats.end())); DAWN_INSTANTIATE_TEST_P(DepthCopyFromBufferTests, - {D3D11Backend(), D3D12Backend(), + {D3D12Backend(), D3D12Backend({"d3d12_use_temp_buffer_in_depth_stencil_texture_and_buffer_" "copy_with_non_zero_buffer_offset"}), MetalBackend(), @@ -1073,7 +1073,7 @@ DAWN_INSTANTIATE_TEST_P(DepthCopyFromBufferTests, DAWN_INSTANTIATE_TEST_P( StencilCopyTests, - {D3D11Backend(), D3D12Backend(), + {D3D12Backend(), D3D12Backend({"d3d12_use_temp_buffer_in_depth_stencil_texture_and_buffer_" "copy_with_non_zero_buffer_offset"}), MetalBackend(), MetalBackend({"metal_use_combined_depth_stencil_format_for_stencil8"}), @@ -1087,7 +1087,7 @@ DAWN_INSTANTIATE_TEST_P( DAWN_INSTANTIATE_TEST_P( DepthStencilCopyTests_RegressionDawn1083, - {D3D11Backend(), D3D12Backend(), MetalBackend(), + {D3D12Backend(), MetalBackend(), MetalBackend({"use_blit_for_depth_texture_to_texture_copy_to_nonzero_subresource"}), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, std::vector{wgpu::TextureFormat::Depth16Unorm, diff --git a/src/dawn/tests/end2end/DepthStencilLoadOpTests.cpp b/src/dawn/tests/end2end/DepthStencilLoadOpTests.cpp index bbb784ed23..29bb81d9cd 100644 --- a/src/dawn/tests/end2end/DepthStencilLoadOpTests.cpp +++ b/src/dawn/tests/end2end/DepthStencilLoadOpTests.cpp @@ -231,14 +231,14 @@ namespace { auto GenerateParam() { auto params1 = MakeParamGenerator( - {D3D11Backend(), D3D12Backend(), D3D12Backend({}, {"use_d3d12_render_pass"}), - MetalBackend(), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, + {D3D12Backend(), D3D12Backend({}, {"use_d3d12_render_pass"}), MetalBackend(), + OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, {wgpu::TextureFormat::Depth32Float, wgpu::TextureFormat::Depth16Unorm}, {Check::CopyDepth, Check::DepthTest, Check::SampleDepth}); auto params2 = MakeParamGenerator( - {D3D11Backend(), D3D12Backend(), D3D12Backend({}, {"use_d3d12_render_pass"}), - MetalBackend(), MetalBackend({"metal_use_combined_depth_stencil_format_for_stencil8"}), + {D3D12Backend(), D3D12Backend({}, {"use_d3d12_render_pass"}), MetalBackend(), + MetalBackend({"metal_use_combined_depth_stencil_format_for_stencil8"}), MetalBackend( {"metal_use_both_depth_and_stencil_attachments_for_combined_depth_stencil_formats"}), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, @@ -294,9 +294,8 @@ TEST_P(StencilClearValueOverflowTest, StencilClearValueOverFlowUint16) { } DAWN_INSTANTIATE_TEST_P(StencilClearValueOverflowTest, - {D3D11Backend(), D3D12Backend(), - D3D12Backend({}, {"use_d3d12_render_pass"}), MetalBackend(), - OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, + {D3D12Backend(), D3D12Backend({}, {"use_d3d12_render_pass"}), + MetalBackend(), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, {wgpu::TextureFormat::Depth24PlusStencil8, wgpu::TextureFormat::Depth32FloatStencil8, wgpu::TextureFormat::Stencil8}, {Check::CopyStencil, Check::StencilTest}); @@ -413,8 +412,8 @@ TEST_P(DepthTextureClearTwiceTest, ClearDepthAspectTwice) { } DAWN_INSTANTIATE_TEST_P(DepthTextureClearTwiceTest, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()}, + {D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), + VulkanBackend()}, {wgpu::TextureFormat::Depth16Unorm, wgpu::TextureFormat::Depth24Plus, wgpu::TextureFormat::Depth32Float, wgpu::TextureFormat::Depth32FloatStencil8, diff --git a/src/dawn/tests/end2end/DepthStencilSamplingTests.cpp b/src/dawn/tests/end2end/DepthStencilSamplingTests.cpp index 1898a87f43..58f84f23a6 100644 --- a/src/dawn/tests/end2end/DepthStencilSamplingTests.cpp +++ b/src/dawn/tests/end2end/DepthStencilSamplingTests.cpp @@ -921,19 +921,19 @@ TEST_P(StencilSamplingTest, SampleStencilOnly) { } DAWN_INSTANTIATE_TEST_P(DepthStencilSamplingTest, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()}, + {D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), + VulkanBackend()}, std::vector(utils::kDepthAndStencilFormats.begin(), utils::kDepthAndStencilFormats.end())); DAWN_INSTANTIATE_TEST_P(DepthSamplingTest, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()}, + {D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), + VulkanBackend()}, std::vector(utils::kDepthFormats.begin(), utils::kDepthFormats.end())); DAWN_INSTANTIATE_TEST_P(StencilSamplingTest, - {D3D11Backend(), D3D12Backend(), MetalBackend(), + {D3D12Backend(), MetalBackend(), MetalBackend({"metal_use_combined_depth_stencil_format_for_stencil8"}), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, std::vector(utils::kStencilFormats.begin(), diff --git a/src/dawn/tests/end2end/DepthStencilStateTests.cpp b/src/dawn/tests/end2end/DepthStencilStateTests.cpp index 0c9457e10e..c2446bca68 100644 --- a/src/dawn/tests/end2end/DepthStencilStateTests.cpp +++ b/src/dawn/tests/end2end/DepthStencilStateTests.cpp @@ -840,7 +840,6 @@ TEST_P(DepthStencilStateTest, StencilReferenceInitialized) { } DAWN_INSTANTIATE_TEST(DepthStencilStateTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/DestroyTests.cpp b/src/dawn/tests/end2end/DestroyTests.cpp index 4b903f5e04..8a2d0bf923 100644 --- a/src/dawn/tests/end2end/DestroyTests.cpp +++ b/src/dawn/tests/end2end/DestroyTests.cpp @@ -213,7 +213,6 @@ TEST_P(DestroyTest, GetQueueAfterDeviceDestroy) { } DAWN_INSTANTIATE_TEST(DestroyTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/DeviceLifetimeTests.cpp b/src/dawn/tests/end2end/DeviceLifetimeTests.cpp index cec6374bf1..ad760fb336 100644 --- a/src/dawn/tests/end2end/DeviceLifetimeTests.cpp +++ b/src/dawn/tests/end2end/DeviceLifetimeTests.cpp @@ -509,7 +509,6 @@ TEST_P(DeviceLifetimeTests, DropDevice2InProcessEvents) { } DAWN_INSTANTIATE_TEST(DeviceLifetimeTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), NullBackend(), diff --git a/src/dawn/tests/end2end/DeviceLostTests.cpp b/src/dawn/tests/end2end/DeviceLostTests.cpp index 61691c444b..a50ed691ec 100644 --- a/src/dawn/tests/end2end/DeviceLostTests.cpp +++ b/src/dawn/tests/end2end/DeviceLostTests.cpp @@ -533,7 +533,6 @@ TEST_P(DeviceLostTest, SetLabelAfterDeviceLoss) { } DAWN_INSTANTIATE_TEST(DeviceLostTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), NullBackend(), diff --git a/src/dawn/tests/end2end/DrawIndexedIndirectTests.cpp b/src/dawn/tests/end2end/DrawIndexedIndirectTests.cpp index 549a5bb34d..f87994f94a 100644 --- a/src/dawn/tests/end2end/DrawIndexedIndirectTests.cpp +++ b/src/dawn/tests/end2end/DrawIndexedIndirectTests.cpp @@ -710,7 +710,6 @@ TEST_P(DrawIndexedIndirectTest, ValidateReusedBundleWithChangingParams) { } DAWN_INSTANTIATE_TEST(DrawIndexedIndirectTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/DrawIndexedTests.cpp b/src/dawn/tests/end2end/DrawIndexedTests.cpp index 48b5a6c314..7f8198c52b 100644 --- a/src/dawn/tests/end2end/DrawIndexedTests.cpp +++ b/src/dawn/tests/end2end/DrawIndexedTests.cpp @@ -156,7 +156,6 @@ TEST_P(DrawIndexedTest, BaseVertex) { } DAWN_INSTANTIATE_TEST(DrawIndexedTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/DrawIndirectTests.cpp b/src/dawn/tests/end2end/DrawIndirectTests.cpp index b1ee3953f7..8c0b28af51 100644 --- a/src/dawn/tests/end2end/DrawIndirectTests.cpp +++ b/src/dawn/tests/end2end/DrawIndirectTests.cpp @@ -129,7 +129,6 @@ TEST_P(DrawIndirectTest, IndirectOffset) { } DAWN_INSTANTIATE_TEST(DrawIndirectTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/DrawTests.cpp b/src/dawn/tests/end2end/DrawTests.cpp index e7ffbca209..10c7e3a14d 100644 --- a/src/dawn/tests/end2end/DrawTests.cpp +++ b/src/dawn/tests/end2end/DrawTests.cpp @@ -101,7 +101,6 @@ TEST_P(DrawTest, Uint32) { } DAWN_INSTANTIATE_TEST(DrawTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/DynamicBufferOffsetTests.cpp b/src/dawn/tests/end2end/DynamicBufferOffsetTests.cpp index 1131857dd2..8f1d59e9ab 100644 --- a/src/dawn/tests/end2end/DynamicBufferOffsetTests.cpp +++ b/src/dawn/tests/end2end/DynamicBufferOffsetTests.cpp @@ -573,7 +573,6 @@ TEST_P(ClampedOOBDynamicBufferOffsetTests, CheckOOBAccess) { } DAWN_INSTANTIATE_TEST(DynamicBufferOffsetTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/EntryPointTests.cpp b/src/dawn/tests/end2end/EntryPointTests.cpp index 2bd1ca47e0..18b3fbda2d 100644 --- a/src/dawn/tests/end2end/EntryPointTests.cpp +++ b/src/dawn/tests/end2end/EntryPointTests.cpp @@ -143,7 +143,6 @@ TEST_P(EntryPointTests, TwoComputeInModule) { } DAWN_INSTANTIATE_TEST(EntryPointTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/FirstIndexOffsetTests.cpp b/src/dawn/tests/end2end/FirstIndexOffsetTests.cpp index 29b0dcf87f..ccb05290f4 100644 --- a/src/dawn/tests/end2end/FirstIndexOffsetTests.cpp +++ b/src/dawn/tests/end2end/FirstIndexOffsetTests.cpp @@ -322,7 +322,6 @@ TEST_P(FirstIndexOffsetTests, IndexedIndirectBothOffset) { } DAWN_INSTANTIATE_TEST(FirstIndexOffsetTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/FragDepthTests.cpp b/src/dawn/tests/end2end/FragDepthTests.cpp index 0b96589bfd..ec3217e6ec 100644 --- a/src/dawn/tests/end2end/FragDepthTests.cpp +++ b/src/dawn/tests/end2end/FragDepthTests.cpp @@ -224,7 +224,6 @@ TEST_P(FragDepthTests, RasterizationClipBeforeFS) { } DAWN_INSTANTIATE_TEST(FragDepthTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/GpuMemorySynchronizationTests.cpp b/src/dawn/tests/end2end/GpuMemorySynchronizationTests.cpp index f19f888409..4b93539345 100644 --- a/src/dawn/tests/end2end/GpuMemorySynchronizationTests.cpp +++ b/src/dawn/tests/end2end/GpuMemorySynchronizationTests.cpp @@ -214,7 +214,6 @@ TEST_P(GpuMemorySyncTests, ComputePassToRenderPass) { } DAWN_INSTANTIATE_TEST(GpuMemorySyncTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -386,7 +385,6 @@ TEST_P(StorageToUniformSyncTests, ReadAfterWriteWithDifferentQueueSubmits) { } DAWN_INSTANTIATE_TEST(StorageToUniformSyncTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -648,7 +646,6 @@ TEST_P(MultipleWriteThenMultipleReadTests, OneBuffer) { } DAWN_INSTANTIATE_TEST(MultipleWriteThenMultipleReadTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/IndexFormatTests.cpp b/src/dawn/tests/end2end/IndexFormatTests.cpp index e46073da1b..fa51f5000c 100644 --- a/src/dawn/tests/end2end/IndexFormatTests.cpp +++ b/src/dawn/tests/end2end/IndexFormatTests.cpp @@ -473,21 +473,18 @@ TEST_P(LineStripPrimitiveRestartTests, Uint16PrimitiveRestart) { } DAWN_INSTANTIATE_TEST(IndexFormatTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()); DAWN_INSTANTIATE_TEST(TriangleStripPrimitiveRestartTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()); DAWN_INSTANTIATE_TEST(LineStripPrimitiveRestartTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/MaxLimitTests.cpp b/src/dawn/tests/end2end/MaxLimitTests.cpp index 9ea70bbf80..0632318ae1 100644 --- a/src/dawn/tests/end2end/MaxLimitTests.cpp +++ b/src/dawn/tests/end2end/MaxLimitTests.cpp @@ -728,7 +728,6 @@ TEST_P(MaxLimitTests, MaxFragmentCombinedOutputResources) { } DAWN_INSTANTIATE_TEST(MaxLimitTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/MemoryAllocationStressTests.cpp b/src/dawn/tests/end2end/MemoryAllocationStressTests.cpp index 4db3f4d85b..59fe068468 100644 --- a/src/dawn/tests/end2end/MemoryAllocationStressTests.cpp +++ b/src/dawn/tests/end2end/MemoryAllocationStressTests.cpp @@ -38,7 +38,6 @@ TEST_P(MemoryAllocationStressTests, LargeBuffer) { } DAWN_INSTANTIATE_TEST(MemoryAllocationStressTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/MultisampledRenderingTests.cpp b/src/dawn/tests/end2end/MultisampledRenderingTests.cpp index 58f5ceeff2..11c2303216 100644 --- a/src/dawn/tests/end2end/MultisampledRenderingTests.cpp +++ b/src/dawn/tests/end2end/MultisampledRenderingTests.cpp @@ -1130,7 +1130,6 @@ TEST_P(MultisampledRenderingTest, ResolveInto2DTextureWithAlphaToCoverageAndRast } DAWN_INSTANTIATE_TEST(MultisampledRenderingTest, - D3D11Backend(), D3D12Backend(), D3D12Backend({}, {"use_d3d12_resource_heap_tier2"}), D3D12Backend({}, {"use_d3d12_render_pass"}), diff --git a/src/dawn/tests/end2end/MultisampledSamplingTests.cpp b/src/dawn/tests/end2end/MultisampledSamplingTests.cpp index dd4cf21a6a..358e98152b 100644 --- a/src/dawn/tests/end2end/MultisampledSamplingTests.cpp +++ b/src/dawn/tests/end2end/MultisampledSamplingTests.cpp @@ -259,7 +259,6 @@ TEST_P(MultisampledSamplingTest, SamplePositions) { } DAWN_INSTANTIATE_TEST(MultisampledSamplingTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/MultithreadTests.cpp b/src/dawn/tests/end2end/MultithreadTests.cpp index 9f88a6abd7..1242b6effa 100644 --- a/src/dawn/tests/end2end/MultithreadTests.cpp +++ b/src/dawn/tests/end2end/MultithreadTests.cpp @@ -50,8 +50,8 @@ class MultithreadTests : public DawnTest { // TODO(crbug.com/dawn/1678): DawnWire doesn't support thread safe API yet. DAWN_TEST_UNSUPPORTED_IF(UsesWire()); - // TODO(crbug.com/dawn/1679): OpenGL/D3D11 backend doesn't support thread safe API yet. - DAWN_TEST_UNSUPPORTED_IF(IsOpenGL() || IsOpenGLES() || IsD3D11()); + // TODO(crbug.com/dawn/1679): OpenGL backend doesn't support thread safe API yet. + DAWN_TEST_UNSUPPORTED_IF(IsOpenGL() || IsOpenGLES()); } wgpu::Buffer CreateBuffer(uint32_t size, wgpu::BufferUsage usage) { @@ -389,7 +389,6 @@ TEST_P(MultithreadTimestampQueryTests, ResolveQuerySets_InParallel) { } // namespace DAWN_INSTANTIATE_TEST(MultithreadEncodingTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -397,7 +396,6 @@ DAWN_INSTANTIATE_TEST(MultithreadEncodingTests, VulkanBackend()); DAWN_INSTANTIATE_TEST(MultithreadDrawIndexedIndirectTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -405,7 +403,6 @@ DAWN_INSTANTIATE_TEST(MultithreadDrawIndexedIndirectTests, VulkanBackend()); DAWN_INSTANTIATE_TEST(MultithreadTimestampQueryTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/ObjectCachingTests.cpp b/src/dawn/tests/end2end/ObjectCachingTests.cpp index d51eeaa404..8a698849fd 100644 --- a/src/dawn/tests/end2end/ObjectCachingTests.cpp +++ b/src/dawn/tests/end2end/ObjectCachingTests.cpp @@ -445,7 +445,6 @@ TEST_P(ObjectCachingTest, SamplerDeduplication) { } DAWN_INSTANTIATE_TEST(ObjectCachingTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/OpArrayLengthTests.cpp b/src/dawn/tests/end2end/OpArrayLengthTests.cpp index a40b42d6ea..c560b2ae56 100644 --- a/src/dawn/tests/end2end/OpArrayLengthTests.cpp +++ b/src/dawn/tests/end2end/OpArrayLengthTests.cpp @@ -275,7 +275,6 @@ TEST_P(OpArrayLengthTest, Vertex) { } DAWN_INSTANTIATE_TEST(OpArrayLengthTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/PipelineCachingTests.cpp b/src/dawn/tests/end2end/PipelineCachingTests.cpp index d5d8062fc0..69e7ef1bfc 100644 --- a/src/dawn/tests/end2end/PipelineCachingTests.cpp +++ b/src/dawn/tests/end2end/PipelineCachingTests.cpp @@ -639,7 +639,6 @@ TEST_P(SinglePipelineCachingTests, RenderPipelineBlobCacheIsolationKey) { } DAWN_INSTANTIATE_TEST(SinglePipelineCachingTests, - D3D11Backend(), D3D12Backend(), D3D12Backend({"use_dxc"}), MetalBackend(), diff --git a/src/dawn/tests/end2end/PipelineLayoutTests.cpp b/src/dawn/tests/end2end/PipelineLayoutTests.cpp index 02dabfe954..dca4be3f26 100644 --- a/src/dawn/tests/end2end/PipelineLayoutTests.cpp +++ b/src/dawn/tests/end2end/PipelineLayoutTests.cpp @@ -144,7 +144,6 @@ TEST_P(PipelineLayoutTests, ComputeAndRenderSamePipelineLayout) { } DAWN_INSTANTIATE_TEST(PipelineLayoutTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/PrimitiveStateTests.cpp b/src/dawn/tests/end2end/PrimitiveStateTests.cpp index 5c3a2bd7be..db1fed4020 100644 --- a/src/dawn/tests/end2end/PrimitiveStateTests.cpp +++ b/src/dawn/tests/end2end/PrimitiveStateTests.cpp @@ -357,7 +357,6 @@ TEST_P(DepthClippingTest, UnclippedNotClamped) { } DAWN_INSTANTIATE_TEST(DepthClippingTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/PrimitiveTopologyTests.cpp b/src/dawn/tests/end2end/PrimitiveTopologyTests.cpp index 1ad47c7ba0..9f4d7d23f1 100644 --- a/src/dawn/tests/end2end/PrimitiveTopologyTests.cpp +++ b/src/dawn/tests/end2end/PrimitiveTopologyTests.cpp @@ -298,7 +298,6 @@ TEST_P(PrimitiveTopologyTest, TriangleStrip) { } DAWN_INSTANTIATE_TEST(PrimitiveTopologyTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/QueryTests.cpp b/src/dawn/tests/end2end/QueryTests.cpp index 1a094910cb..0635c759ae 100644 --- a/src/dawn/tests/end2end/QueryTests.cpp +++ b/src/dawn/tests/end2end/QueryTests.cpp @@ -1284,27 +1284,23 @@ TEST_P(TimestampQueryInsidePassesTests, FromComputePass) { } DAWN_INSTANTIATE_TEST(OcclusionQueryTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), MetalBackend({"metal_fill_empty_occlusion_queries_with_zero"}), VulkanBackend()); DAWN_INSTANTIATE_TEST(PipelineStatisticsQueryTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()); DAWN_INSTANTIATE_TEST(TimestampQueryTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()); DAWN_INSTANTIATE_TEST(TimestampQueryInsidePassesTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/QueueTests.cpp b/src/dawn/tests/end2end/QueueTests.cpp index 2de1b49507..23e6f40ffc 100644 --- a/src/dawn/tests/end2end/QueueTests.cpp +++ b/src/dawn/tests/end2end/QueueTests.cpp @@ -30,7 +30,6 @@ TEST_P(QueueTests, GetQueueSameObject) { } DAWN_INSTANTIATE_TEST(QueueTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), NullBackend(), @@ -188,7 +187,6 @@ TEST_P(QueueWriteBufferTests, UnalignedDynamicUploader) { } DAWN_INSTANTIATE_TEST(QueueWriteBufferTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -773,7 +771,6 @@ TEST_P(QueueWriteTextureTests, WriteStencilAspectAfterOtherQueueWriteTextureCall } DAWN_INSTANTIATE_TEST(QueueWriteTextureTests, - D3D11Backend(), D3D12Backend(), D3D12Backend({"d3d12_use_temp_buffer_in_depth_stencil_texture_and_buffer_" "copy_with_non_zero_buffer_offset"}), diff --git a/src/dawn/tests/end2end/QueueTimelineTests.cpp b/src/dawn/tests/end2end/QueueTimelineTests.cpp index cbdbfa44f2..b07ca08d54 100644 --- a/src/dawn/tests/end2end/QueueTimelineTests.cpp +++ b/src/dawn/tests/end2end/QueueTimelineTests.cpp @@ -96,7 +96,6 @@ TEST_P(QueueTimelineTests, OnWorkDone_MapRead) { } DAWN_INSTANTIATE_TEST(QueueTimelineTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/ReadOnlyDepthStencilAttachmentTests.cpp b/src/dawn/tests/end2end/ReadOnlyDepthStencilAttachmentTests.cpp index 26228c9334..06e66885e9 100644 --- a/src/dawn/tests/end2end/ReadOnlyDepthStencilAttachmentTests.cpp +++ b/src/dawn/tests/end2end/ReadOnlyDepthStencilAttachmentTests.cpp @@ -344,14 +344,12 @@ TEST_P(ReadOnlyStencilAttachmentTests, NotSampleFromAttachment) { } DAWN_INSTANTIATE_TEST_P(ReadOnlyDepthAttachmentTests, - {D3D11Backend(), D3D12Backend(), - D3D12Backend({}, {"use_d3d12_render_pass"}), MetalBackend(), - VulkanBackend()}, + {D3D12Backend(), D3D12Backend({}, {"use_d3d12_render_pass"}), + MetalBackend(), VulkanBackend()}, std::vector(utils::kDepthFormats.begin(), utils::kDepthFormats.end())); DAWN_INSTANTIATE_TEST_P(ReadOnlyStencilAttachmentTests, - {D3D11Backend(), D3D12Backend(), - D3D12Backend({}, {"use_d3d12_render_pass"}), MetalBackend(), - VulkanBackend()}, + {D3D12Backend(), D3D12Backend({}, {"use_d3d12_render_pass"}), + MetalBackend(), VulkanBackend()}, std::vector(utils::kStencilFormats.begin(), utils::kStencilFormats.end())); diff --git a/src/dawn/tests/end2end/RenderAttachmentTests.cpp b/src/dawn/tests/end2end/RenderAttachmentTests.cpp index dbc095c859..bfc71880f1 100644 --- a/src/dawn/tests/end2end/RenderAttachmentTests.cpp +++ b/src/dawn/tests/end2end/RenderAttachmentTests.cpp @@ -76,7 +76,6 @@ TEST_P(RenderAttachmentTest, MoreFragmentOutputsThanAttachments) { } DAWN_INSTANTIATE_TEST(RenderAttachmentTest, - D3D11Backend(), D3D12Backend(), D3D12Backend({}, {"use_d3d12_render_pass"}), MetalBackend(), diff --git a/src/dawn/tests/end2end/RenderBundleTests.cpp b/src/dawn/tests/end2end/RenderBundleTests.cpp index abdefab972..d3e8e2f1fb 100644 --- a/src/dawn/tests/end2end/RenderBundleTests.cpp +++ b/src/dawn/tests/end2end/RenderBundleTests.cpp @@ -194,7 +194,6 @@ TEST_P(RenderBundleTest, BundleAndRenderPassCommands) { } DAWN_INSTANTIATE_TEST(RenderBundleTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/RenderPassLoadOpTests.cpp b/src/dawn/tests/end2end/RenderPassLoadOpTests.cpp index f25f5fd037..8eac3edaf6 100644 --- a/src/dawn/tests/end2end/RenderPassLoadOpTests.cpp +++ b/src/dawn/tests/end2end/RenderPassLoadOpTests.cpp @@ -714,7 +714,6 @@ TEST_P(RenderPassLoadOpTests, MixedUseOfLoadOpLoadAndLoadOpClearWithBigIntegerVa } DAWN_INSTANTIATE_TEST(RenderPassLoadOpTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/RenderPassTests.cpp b/src/dawn/tests/end2end/RenderPassTests.cpp index 9a14a4a69e..14e8d727e6 100644 --- a/src/dawn/tests/end2end/RenderPassTests.cpp +++ b/src/dawn/tests/end2end/RenderPassTests.cpp @@ -166,7 +166,6 @@ TEST_P(RenderPassTest, NoCorrespondingFragmentShaderOutputs) { } DAWN_INSTANTIATE_TEST(RenderPassTest, - D3D11Backend(), D3D12Backend(), D3D12Backend({}, {"use_d3d12_render_pass"}), MetalBackend(), @@ -226,7 +225,6 @@ TEST_P(RenderPassTest_RegressionDawn1071, ClearLowestMipOfR8Unorm) { } DAWN_INSTANTIATE_TEST(RenderPassTest_RegressionDawn1071, - D3D11Backend(), D3D12Backend(), MetalBackend(), MetalBackend({"metal_render_r8_rg8_unorm_small_mip_to_temp_texture"}), @@ -361,7 +359,6 @@ TEST_P(RenderPassTest_RegressionDawn1389, ClearMultisubresourceAfterWriteDepth16 } DAWN_INSTANTIATE_TEST(RenderPassTest_RegressionDawn1389, - D3D11Backend(), D3D12Backend(), MetalBackend(), MetalBackend({"use_blit_for_buffer_to_depth_texture_copy"}), diff --git a/src/dawn/tests/end2end/RequiredBufferSizeInCopyTests.cpp b/src/dawn/tests/end2end/RequiredBufferSizeInCopyTests.cpp index 6d5c0385a9..58c45cef65 100644 --- a/src/dawn/tests/end2end/RequiredBufferSizeInCopyTests.cpp +++ b/src/dawn/tests/end2end/RequiredBufferSizeInCopyTests.cpp @@ -199,9 +199,8 @@ TEST_P(RequiredBufferSizeInCopyTests, MinimumBufferSize) { DAWN_INSTANTIATE_TEST_P( RequiredBufferSizeInCopyTests, - {D3D11Backend(), D3D12Backend(), - D3D12Backend({"d3d12_split_buffer_texture_copy_for_rows_per_image_paddings"}), MetalBackend(), - OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, + {D3D12Backend(), D3D12Backend({"d3d12_split_buffer_texture_copy_for_rows_per_image_paddings"}), + MetalBackend(), OpenGLBackend(), OpenGLESBackend(), VulkanBackend()}, {Type::T2BCopy, Type::B2TCopy}, {wgpu::TextureDimension::e3D, wgpu::TextureDimension::e2D}, {2u, 1u}, diff --git a/src/dawn/tests/end2end/SamplerFilterAnisotropicTests.cpp b/src/dawn/tests/end2end/SamplerFilterAnisotropicTests.cpp index 0a54085f0f..f201d75d49 100644 --- a/src/dawn/tests/end2end/SamplerFilterAnisotropicTests.cpp +++ b/src/dawn/tests/end2end/SamplerFilterAnisotropicTests.cpp @@ -288,7 +288,6 @@ TEST_P(SamplerFilterAnisotropicTest, SlantedPlaneMipmap) { } DAWN_INSTANTIATE_TEST(SamplerFilterAnisotropicTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/SamplerTests.cpp b/src/dawn/tests/end2end/SamplerTests.cpp index 3960ec303b..c2dcb277fd 100644 --- a/src/dawn/tests/end2end/SamplerTests.cpp +++ b/src/dawn/tests/end2end/SamplerTests.cpp @@ -205,7 +205,6 @@ TEST_P(SamplerTest, PassThroughUserFunctionParameters) { } DAWN_INSTANTIATE_TEST(SamplerTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/ScissorTests.cpp b/src/dawn/tests/end2end/ScissorTests.cpp index 5d9a2fab8b..60e5199baf 100644 --- a/src/dawn/tests/end2end/ScissorTests.cpp +++ b/src/dawn/tests/end2end/ScissorTests.cpp @@ -152,7 +152,6 @@ TEST_P(ScissorTest, NoInheritanceBetweenRenderPass) { } DAWN_INSTANTIATE_TEST(ScissorTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/ShaderF16Tests.cpp b/src/dawn/tests/end2end/ShaderF16Tests.cpp index 243118b9b0..20ee517986 100644 --- a/src/dawn/tests/end2end/ShaderF16Tests.cpp +++ b/src/dawn/tests/end2end/ShaderF16Tests.cpp @@ -443,7 +443,6 @@ fn FSMain(@location(0) color : vec4f) -> @location(0) vec4f { // DawnTestBase::CreateDeviceImpl always disable disallow_unsafe_apis toggle. DAWN_INSTANTIATE_TEST_P(ShaderF16Tests, { - D3D11Backend(), D3D12Backend(), D3D12Backend({"use_dxc"}), VulkanBackend(), diff --git a/src/dawn/tests/end2end/ShaderTests.cpp b/src/dawn/tests/end2end/ShaderTests.cpp index 6094ab9b42..2e91325bfc 100644 --- a/src/dawn/tests/end2end/ShaderTests.cpp +++ b/src/dawn/tests/end2end/ShaderTests.cpp @@ -1424,7 +1424,6 @@ fn main(@location(0) value : f32) -> @location(0) vec4f { } DAWN_INSTANTIATE_TEST(ShaderTests, - D3D11Backend(), D3D12Backend(), D3D12Backend({"use_dxc"}), MetalBackend(), diff --git a/src/dawn/tests/end2end/ShaderValidationTests.cpp b/src/dawn/tests/end2end/ShaderValidationTests.cpp index 9555f729fe..94da47fb06 100644 --- a/src/dawn/tests/end2end/ShaderValidationTests.cpp +++ b/src/dawn/tests/end2end/ShaderValidationTests.cpp @@ -375,7 +375,6 @@ TEST_P(WorkgroupSizeValidationTest, ValidationAfterOverrideStorageSize) { } DAWN_INSTANTIATE_TEST(WorkgroupSizeValidationTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), NullBackend(), diff --git a/src/dawn/tests/end2end/StorageTextureTests.cpp b/src/dawn/tests/end2end/StorageTextureTests.cpp index 1a1b4136e8..040363260e 100644 --- a/src/dawn/tests/end2end/StorageTextureTests.cpp +++ b/src/dawn/tests/end2end/StorageTextureTests.cpp @@ -867,7 +867,6 @@ TEST_P(StorageTextureTests, SampledAndWriteonlyStorageTexturePingPong) { } DAWN_INSTANTIATE_TEST(StorageTextureTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -932,7 +931,6 @@ TEST_P(BGRA8UnormStorageTextureTests, WriteonlyStorageTextureInFragmentShader) { } DAWN_INSTANTIATE_TEST(BGRA8UnormStorageTextureTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/SubresourceRenderAttachmentTests.cpp b/src/dawn/tests/end2end/SubresourceRenderAttachmentTests.cpp index 27f3bf9b07..9722c531d0 100644 --- a/src/dawn/tests/end2end/SubresourceRenderAttachmentTests.cpp +++ b/src/dawn/tests/end2end/SubresourceRenderAttachmentTests.cpp @@ -172,7 +172,6 @@ TEST_P(SubresourceRenderAttachmentTest, StencilTexture) { } DAWN_INSTANTIATE_TEST(SubresourceRenderAttachmentTest, - D3D11Backend(), D3D12Backend(), D3D12Backend({}, {"use_d3d12_render_pass"}), MetalBackend(), diff --git a/src/dawn/tests/end2end/Texture3DTests.cpp b/src/dawn/tests/end2end/Texture3DTests.cpp index 4dee0a249c..6a6381deb6 100644 --- a/src/dawn/tests/end2end/Texture3DTests.cpp +++ b/src/dawn/tests/end2end/Texture3DTests.cpp @@ -118,7 +118,6 @@ TEST_P(Texture3DTests, Sampling) { } DAWN_INSTANTIATE_TEST(Texture3DTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/TextureFormatTests.cpp b/src/dawn/tests/end2end/TextureFormatTests.cpp index 932926e592..5431e0053e 100644 --- a/src/dawn/tests/end2end/TextureFormatTests.cpp +++ b/src/dawn/tests/end2end/TextureFormatTests.cpp @@ -897,7 +897,6 @@ TEST_P(TextureFormatTest, RGB9E5Ufloat) { } DAWN_INSTANTIATE_TEST(TextureFormatTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/TextureSubresourceTests.cpp b/src/dawn/tests/end2end/TextureSubresourceTests.cpp index 4d9584b58d..169f89d164 100644 --- a/src/dawn/tests/end2end/TextureSubresourceTests.cpp +++ b/src/dawn/tests/end2end/TextureSubresourceTests.cpp @@ -189,7 +189,6 @@ TEST_P(TextureSubresourceTest, ArrayLayersTest) { } DAWN_INSTANTIATE_TEST(TextureSubresourceTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/TextureViewTests.cpp b/src/dawn/tests/end2end/TextureViewTests.cpp index d28c72e605..7b8c2bb172 100644 --- a/src/dawn/tests/end2end/TextureViewTests.cpp +++ b/src/dawn/tests/end2end/TextureViewTests.cpp @@ -977,7 +977,6 @@ TEST_P(TextureViewRenderingTest, SRGBReinterpretionResolveAttachment) { } DAWN_INSTANTIATE_TEST(TextureViewSamplingTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -985,7 +984,6 @@ DAWN_INSTANTIATE_TEST(TextureViewSamplingTest, VulkanBackend()); DAWN_INSTANTIATE_TEST(TextureViewRenderingTest, - D3D11Backend(), D3D12Backend(), D3D12Backend({}, {"use_d3d12_render_pass"}), MetalBackend(), @@ -1026,7 +1024,6 @@ TEST_P(TextureViewTest, DestroyedTexture) { } DAWN_INSTANTIATE_TEST(TextureViewTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -1043,7 +1040,6 @@ TEST_P(TextureView3DTest, BasicTest) { } DAWN_INSTANTIATE_TEST(TextureView3DTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -1118,7 +1114,6 @@ TEST_P(TextureView1DTest, Sampling) { } DAWN_INSTANTIATE_TEST(TextureView1DTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), VulkanBackend(), diff --git a/src/dawn/tests/end2end/VertexFormatTests.cpp b/src/dawn/tests/end2end/VertexFormatTests.cpp index 42c6aec826..34182dc62d 100644 --- a/src/dawn/tests/end2end/VertexFormatTests.cpp +++ b/src/dawn/tests/end2end/VertexFormatTests.cpp @@ -829,7 +829,6 @@ TEST_P(VertexFormatTest, Sint32x4) { } DAWN_INSTANTIATE_TEST(VertexFormatTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/VertexOnlyRenderPipelineTests.cpp b/src/dawn/tests/end2end/VertexOnlyRenderPipelineTests.cpp index bdf9ab86da..a02562b727 100644 --- a/src/dawn/tests/end2end/VertexOnlyRenderPipelineTests.cpp +++ b/src/dawn/tests/end2end/VertexOnlyRenderPipelineTests.cpp @@ -307,8 +307,6 @@ TEST_P(VertexOnlyRenderPipelineTest, MultiplePass) { } DAWN_INSTANTIATE_TEST(VertexOnlyRenderPipelineTest, - D3D11Backend(), - D3D11Backend({"use_placeholder_fragment_in_vertex_only_pipeline"}), D3D12Backend(), D3D12Backend({"use_placeholder_fragment_in_vertex_only_pipeline"}), MetalBackend(), diff --git a/src/dawn/tests/end2end/VertexStateTests.cpp b/src/dawn/tests/end2end/VertexStateTests.cpp index 5a962aba62..5b0e49b9ff 100644 --- a/src/dawn/tests/end2end/VertexStateTests.cpp +++ b/src/dawn/tests/end2end/VertexStateTests.cpp @@ -645,7 +645,6 @@ TEST_P(VertexStateTest, OverlappingVertexAttributes) { } DAWN_INSTANTIATE_TEST(VertexStateTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), @@ -692,7 +691,6 @@ TEST_P(OptionalVertexStateTest, Basic) { } DAWN_INSTANTIATE_TEST(OptionalVertexStateTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/ViewportOrientationTests.cpp b/src/dawn/tests/end2end/ViewportOrientationTests.cpp index 11b7fdcb1d..8e8f1e7182 100644 --- a/src/dawn/tests/end2end/ViewportOrientationTests.cpp +++ b/src/dawn/tests/end2end/ViewportOrientationTests.cpp @@ -59,7 +59,6 @@ TEST_P(ViewportOrientationTests, OriginAt0x0) { } DAWN_INSTANTIATE_TEST(ViewportOrientationTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/end2end/ViewportTests.cpp b/src/dawn/tests/end2end/ViewportTests.cpp index 6233c4ad7c..5fbeed0c41 100644 --- a/src/dawn/tests/end2end/ViewportTests.cpp +++ b/src/dawn/tests/end2end/ViewportTests.cpp @@ -220,7 +220,6 @@ TEST_P(ViewportTest, EmptyViewport) { } DAWN_INSTANTIATE_TEST(ViewportTest, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/perf_tests/BufferUploadPerf.cpp b/src/dawn/tests/perf_tests/BufferUploadPerf.cpp index 1e8df070bb..8381729de0 100644 --- a/src/dawn/tests/perf_tests/BufferUploadPerf.cpp +++ b/src/dawn/tests/perf_tests/BufferUploadPerf.cpp @@ -147,8 +147,7 @@ TEST_P(BufferUploadPerf, Run) { } DAWN_INSTANTIATE_TEST_P(BufferUploadPerf, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), - VulkanBackend()}, + {D3D12Backend(), MetalBackend(), OpenGLBackend(), VulkanBackend()}, {UploadMethod::WriteBuffer, UploadMethod::MappedAtCreation}, {UploadSize::BufferSize_1KB, UploadSize::BufferSize_64KB, UploadSize::BufferSize_1MB, UploadSize::BufferSize_4MB, diff --git a/src/dawn/tests/perf_tests/DrawCallPerf.cpp b/src/dawn/tests/perf_tests/DrawCallPerf.cpp index cf89f9bfe6..640e156137 100644 --- a/src/dawn/tests/perf_tests/DrawCallPerf.cpp +++ b/src/dawn/tests/perf_tests/DrawCallPerf.cpp @@ -597,7 +597,7 @@ TEST_P(DrawCallPerf, Run) { DAWN_INSTANTIATE_TEST_P( DrawCallPerf, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), VulkanBackend(), + {D3D12Backend(), MetalBackend(), OpenGLBackend(), VulkanBackend(), VulkanBackend({"skip_validation"})}, { // Baseline diff --git a/src/dawn/tests/perf_tests/ShaderRobustnessPerf.cpp b/src/dawn/tests/perf_tests/ShaderRobustnessPerf.cpp index 5f2553b293..3b174ad017 100644 --- a/src/dawn/tests/perf_tests/ShaderRobustnessPerf.cpp +++ b/src/dawn/tests/perf_tests/ShaderRobustnessPerf.cpp @@ -497,8 +497,7 @@ TEST_P(ShaderRobustnessPerf, Run) { } DAWN_INSTANTIATE_TEST_P(ShaderRobustnessPerf, - {D3D11Backend(), D3D11Backend({"disable_robustness"}, {}), D3D12Backend(), - D3D12Backend({"disable_robustness"}, {}), MetalBackend(), + {D3D12Backend(), D3D12Backend({"disable_robustness"}, {}), MetalBackend(), MetalBackend({"disable_robustness"}, {}), OpenGLBackend(), OpenGLBackend({"disable_robustness"}, {}), VulkanBackend(), VulkanBackend({"disable_robustness"}, {})}, diff --git a/src/dawn/tests/perf_tests/SubresourceTrackingPerf.cpp b/src/dawn/tests/perf_tests/SubresourceTrackingPerf.cpp index eacaab1333..e3ccb6f586 100644 --- a/src/dawn/tests/perf_tests/SubresourceTrackingPerf.cpp +++ b/src/dawn/tests/perf_tests/SubresourceTrackingPerf.cpp @@ -144,7 +144,6 @@ TEST_P(SubresourceTrackingPerf, Run) { } DAWN_INSTANTIATE_TEST_P(SubresourceTrackingPerf, - {D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), - VulkanBackend()}, + {D3D12Backend(), MetalBackend(), OpenGLBackend(), VulkanBackend()}, {1, 4, 16, 256}, {2, 3, 8}); diff --git a/src/dawn/tests/white_box/BufferAllocatedSizeTests.cpp b/src/dawn/tests/white_box/BufferAllocatedSizeTests.cpp index e09e371462..cfa90260ab 100644 --- a/src/dawn/tests/white_box/BufferAllocatedSizeTests.cpp +++ b/src/dawn/tests/white_box/BufferAllocatedSizeTests.cpp @@ -36,17 +36,12 @@ class BufferAllocatedSizeTests : public DawnTest { // Test expected allocated size for buffers with uniform usage TEST_P(BufferAllocatedSizeTests, UniformUsage) { - // D3D11 backend doesn't support buffer with both uniform and storage usage. - DAWN_SUPPRESS_TEST_IF(IsD3D11()); - // Some backends have a minimum buffer size, so make sure // we allocate above that. constexpr uint32_t kMinBufferSize = 4u; uint32_t requiredBufferAlignment = 1u; - if (IsD3D11()) { - requiredBufferAlignment = 256u; - } else if (IsD3D12()) { + if (IsD3D12()) { requiredBufferAlignment = 256u; } else if (IsMetal()) { requiredBufferAlignment = 16u; @@ -83,7 +78,6 @@ TEST_P(BufferAllocatedSizeTests, UniformUsage) { } DAWN_INSTANTIATE_TEST(BufferAllocatedSizeTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), OpenGLBackend(), diff --git a/src/dawn/tests/white_box/InternalStorageBufferBindingTests.cpp b/src/dawn/tests/white_box/InternalStorageBufferBindingTests.cpp index 0b634394df..0be3d3b4b7 100644 --- a/src/dawn/tests/white_box/InternalStorageBufferBindingTests.cpp +++ b/src/dawn/tests/white_box/InternalStorageBufferBindingTests.cpp @@ -108,7 +108,6 @@ TEST_P(InternalStorageBufferBindingTests, QueryResolveBufferBoundAsInternalStora } DAWN_INSTANTIATE_TEST(InternalStorageBufferBindingTests, - D3D11Backend(), D3D12Backend(), MetalBackend(), VulkanBackend()); diff --git a/src/dawn/tests/white_box/QueryInternalShaderTests.cpp b/src/dawn/tests/white_box/QueryInternalShaderTests.cpp index b63453cff4..296bbaaf91 100644 --- a/src/dawn/tests/white_box/QueryInternalShaderTests.cpp +++ b/src/dawn/tests/white_box/QueryInternalShaderTests.cpp @@ -224,8 +224,4 @@ TEST_P(QueryInternalShaderTests, TimestampComputeShader) { } } -DAWN_INSTANTIATE_TEST(QueryInternalShaderTests, - D3D11Backend(), - D3D12Backend(), - MetalBackend(), - VulkanBackend()); +DAWN_INSTANTIATE_TEST(QueryInternalShaderTests, D3D12Backend(), MetalBackend(), VulkanBackend());