From ab59a10f2c05d726dc9e13dd77ec1ec331a2a7b2 Mon Sep 17 00:00:00 2001 From: Stephen White Date: Tue, 1 Dec 2020 18:37:19 +0000 Subject: [PATCH] Enable most C* end-to-end tests on OpenGL ES. This enables all the C* tests which are also enabled on desktop GL. BUG=dawn:580 Change-Id: I71cf500a19fc4f81e0de47483d9b1de49df9bf76 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/34500 Reviewed-by: Corentin Wallez Reviewed-by: Austin Eng Commit-Queue: Stephen White --- src/tests/end2end/ClipSpaceTests.cpp | 1 + src/tests/end2end/ColorStateTests.cpp | 1 + src/tests/end2end/CompressedTextureFormatTests.cpp | 2 ++ src/tests/end2end/ComputeCopyStorageBufferTests.cpp | 1 + src/tests/end2end/ComputeIndirectTests.cpp | 1 + src/tests/end2end/ComputeSharedMemoryTests.cpp | 1 + src/tests/end2end/ComputeStorageBufferBarrierTests.cpp | 1 + src/tests/end2end/CopyTests.cpp | 1 + src/tests/end2end/CopyTextureForBrowserTests.cpp | 2 ++ src/tests/end2end/CreateReadyPipelineTests.cpp | 1 + src/tests/end2end/CullingTests.cpp | 1 + 11 files changed, 13 insertions(+) diff --git a/src/tests/end2end/ClipSpaceTests.cpp b/src/tests/end2end/ClipSpaceTests.cpp index 055fdeee46..fcb019eb62 100644 --- a/src/tests/end2end/ClipSpaceTests.cpp +++ b/src/tests/end2end/ClipSpaceTests.cpp @@ -102,4 +102,5 @@ DAWN_INSTANTIATE_TEST(ClipSpaceTest, D3D12Backend(), MetalBackend(), OpenGLBackend(), + OpenGLESBackend(), VulkanBackend()); diff --git a/src/tests/end2end/ColorStateTests.cpp b/src/tests/end2end/ColorStateTests.cpp index edee56baab..766015d4e1 100644 --- a/src/tests/end2end/ColorStateTests.cpp +++ b/src/tests/end2end/ColorStateTests.cpp @@ -1061,4 +1061,5 @@ DAWN_INSTANTIATE_TEST(ColorStateTest, D3D12Backend(), MetalBackend(), OpenGLBackend(), + OpenGLESBackend(), VulkanBackend()); diff --git a/src/tests/end2end/CompressedTextureFormatTests.cpp b/src/tests/end2end/CompressedTextureFormatTests.cpp index b58ed31903..453da66e7d 100644 --- a/src/tests/end2end/CompressedTextureFormatTests.cpp +++ b/src/tests/end2end/CompressedTextureFormatTests.cpp @@ -1077,6 +1077,7 @@ TEST_P(CompressedTextureBCFormatTest, CopyMultiple2DArrayLayers) { TEST_P(CompressedTextureBCFormatTest, UnalignedDynamicUploader) { // CopyT2B for compressed texture formats is unimplemented on OpenGL. DAWN_SKIP_TEST_IF(IsOpenGL()); + DAWN_SKIP_TEST_IF(IsOpenGLES()); utils::UnalignDynamicUploader(device); @@ -1106,6 +1107,7 @@ DAWN_INSTANTIATE_TEST(CompressedTextureBCFormatTest, D3D12Backend(), MetalBackend(), OpenGLBackend(), + OpenGLESBackend(), VulkanBackend(), VulkanBackend({"use_temporary_buffer_in_texture_to_texture_copy"})); diff --git a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp index f127acdb36..2b0315774c 100644 --- a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp +++ b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp @@ -176,4 +176,5 @@ DAWN_INSTANTIATE_TEST(ComputeCopyStorageBufferTests, D3D12Backend(), MetalBackend(), OpenGLBackend(), + OpenGLESBackend(), VulkanBackend()); diff --git a/src/tests/end2end/ComputeIndirectTests.cpp b/src/tests/end2end/ComputeIndirectTests.cpp index dbd167cdb3..d75dbfbd56 100644 --- a/src/tests/end2end/ComputeIndirectTests.cpp +++ b/src/tests/end2end/ComputeIndirectTests.cpp @@ -111,4 +111,5 @@ DAWN_INSTANTIATE_TEST(ComputeIndirectTests, D3D12Backend(), MetalBackend(), OpenGLBackend(), + OpenGLESBackend(), VulkanBackend()); diff --git a/src/tests/end2end/ComputeSharedMemoryTests.cpp b/src/tests/end2end/ComputeSharedMemoryTests.cpp index a11c01a0a5..aee0e50aa0 100644 --- a/src/tests/end2end/ComputeSharedMemoryTests.cpp +++ b/src/tests/end2end/ComputeSharedMemoryTests.cpp @@ -101,4 +101,5 @@ DAWN_INSTANTIATE_TEST(ComputeSharedMemoryTests, D3D12Backend(), MetalBackend(), OpenGLBackend(), + OpenGLESBackend(), VulkanBackend()); diff --git a/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp b/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp index e5b2586120..3fe9de90d7 100644 --- a/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp +++ b/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp @@ -324,4 +324,5 @@ DAWN_INSTANTIATE_TEST(ComputeStorageBufferBarrierTests, D3D12Backend(), MetalBackend(), OpenGLBackend(), + OpenGLESBackend(), VulkanBackend()); diff --git a/src/tests/end2end/CopyTests.cpp b/src/tests/end2end/CopyTests.cpp index 98a1f091f2..4902ee6ad6 100644 --- a/src/tests/end2end/CopyTests.cpp +++ b/src/tests/end2end/CopyTests.cpp @@ -1612,4 +1612,5 @@ DAWN_INSTANTIATE_TEST(CopyTests_B2B, D3D12Backend(), MetalBackend(), OpenGLBackend(), + OpenGLESBackend(), VulkanBackend()); diff --git a/src/tests/end2end/CopyTextureForBrowserTests.cpp b/src/tests/end2end/CopyTextureForBrowserTests.cpp index 009f4ba537..587532d45d 100644 --- a/src/tests/end2end/CopyTextureForBrowserTests.cpp +++ b/src/tests/end2end/CopyTextureForBrowserTests.cpp @@ -163,6 +163,7 @@ TEST_P(CopyTextureForBrowserTests, PassthroughCopy) { // OpenGL tests fails due to 'WriteTexture' unimplemented. // Related bug : crbug.com/dawn/483 DAWN_SKIP_TEST_IF(IsOpenGL()); + DAWN_SKIP_TEST_IF(IsOpenGLES()); constexpr uint32_t kWidth = 10; constexpr uint32_t kHeight = 1; @@ -232,4 +233,5 @@ DAWN_INSTANTIATE_TEST(CopyTextureForBrowserTests, D3D12Backend(), MetalBackend(), OpenGLBackend(), + OpenGLESBackend(), VulkanBackend()); diff --git a/src/tests/end2end/CreateReadyPipelineTests.cpp b/src/tests/end2end/CreateReadyPipelineTests.cpp index ec8037cb8c..7a8f673244 100644 --- a/src/tests/end2end/CreateReadyPipelineTests.cpp +++ b/src/tests/end2end/CreateReadyPipelineTests.cpp @@ -331,4 +331,5 @@ DAWN_INSTANTIATE_TEST(CreateReadyPipelineTest, D3D12Backend(), MetalBackend(), OpenGLBackend(), + OpenGLESBackend(), VulkanBackend()); diff --git a/src/tests/end2end/CullingTests.cpp b/src/tests/end2end/CullingTests.cpp index 2f54a101d8..e7f62f7688 100644 --- a/src/tests/end2end/CullingTests.cpp +++ b/src/tests/end2end/CullingTests.cpp @@ -136,4 +136,5 @@ DAWN_INSTANTIATE_TEST(CullingTest, D3D12Backend(), MetalBackend(), OpenGLBackend(), + OpenGLESBackend(), VulkanBackend());