From 022952303c1a734b22430aa435902baa22b939e3 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Mon, 16 Mar 2020 10:59:56 +0000 Subject: [PATCH] Suppress two -Wunreachable-code warnings. Bug: chromium:346399 Change-Id: Ieb76cf99022230dcfb0bc6b17f95ea544040a796 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/17040 Commit-Queue: Corentin Wallez Reviewed-by: Corentin Wallez --- .../validation/GetBindGroupLayoutValidationTests.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp b/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp index 40a63b3b8e..6b2f0daacc 100644 --- a/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp +++ b/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp @@ -258,6 +258,7 @@ TEST_F(GetBindGroupLayoutTests, Multisampled) { // TODO: Support multisampling GTEST_SKIP() << "Multisampling unimplemented"; +#if 0 { binding.multisampled = true; wgpu::RenderPipeline pipeline = RenderPipelineFromFragmentShader(R"( @@ -267,6 +268,7 @@ TEST_F(GetBindGroupLayoutTests, Multisampled) { void main() {})"); EXPECT_EQ(device.CreateBindGroupLayout(&desc).Get(), pipeline.GetBindGroupLayout(0).Get()); } +#endif } // Test that texture view dimension matches the shader. @@ -497,10 +499,8 @@ TEST_F(GetBindGroupLayoutTests, ConflictingBindingType) { } // Test it is invalid to have conflicting binding texture multisampling in the shaders. -TEST_F(GetBindGroupLayoutTests, ConflictingBindingTextureMultisampling) { - // TODO: Support multisampling - GTEST_SKIP() << "Multisampling unimplemented"; - +// TODO: Support multisampling +TEST_F(GetBindGroupLayoutTests, DISABLED_ConflictingBindingTextureMultisampling) { wgpu::ShaderModule vsModule = utils::CreateShaderModule(device, utils::SingleShaderStage::Vertex, R"( #version 450