From fb367e32c6ee5f24db7c0e5673b1059074d103cc Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Wed, 4 Nov 2020 15:59:11 +0000 Subject: [PATCH] Reenable DepthBias tests on Swiftshader The fix in Swiftshader has been rolled into Dawn so they pass. Bug: dawn:524 Change-Id: I0328672f6cdb829cb28799160d9f584ebed2e422 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/31666 Reviewed-by: Austin Eng Commit-Queue: Corentin Wallez --- src/tests/end2end/DepthBiasTests.cpp | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/tests/end2end/DepthBiasTests.cpp b/src/tests/end2end/DepthBiasTests.cpp index e3ef7dff81..112f622d4a 100644 --- a/src/tests/end2end/DepthBiasTests.cpp +++ b/src/tests/end2end/DepthBiasTests.cpp @@ -139,10 +139,6 @@ TEST_P(DepthBiasTests, PositiveBiasOnFloat) { // NVIDIA GPUs under Vulkan seem to be using a different scale than everyone else. DAWN_SKIP_TEST_IF(IsVulkan() && IsNvidia()); - // SwiftShader incorrectly uses depthBias directly when calculating bias. - // TODO(enrico.galli@intel.com): Remove once it has been fixed upstream. - DAWN_SKIP_TEST_IF(IsVulkan() && IsSwiftshader()); - // OpenGL uses a different scale than the other APIs DAWN_SKIP_TEST_IF(IsOpenGL()); @@ -162,10 +158,6 @@ TEST_P(DepthBiasTests, PositiveBiasOnFloat) { // Test adding positive bias to output with a clamp TEST_P(DepthBiasTests, PositiveBiasOnFloatWithClamp) { - // SwiftShader incorrectly uses depthBias directly when calculating bias. - // TODO(enrico.galli@intel.com): Remove once it has been fixed upstream. - DAWN_SKIP_TEST_IF(IsVulkan() && IsSwiftshader()); - // Clamping support in OpenGL is spotty DAWN_SKIP_TEST_IF(IsOpenGL()); @@ -188,10 +180,6 @@ TEST_P(DepthBiasTests, NegativeBiasOnFloat) { // NVIDIA GPUs seems to be using a different scale than everyone else DAWN_SKIP_TEST_IF(IsVulkan() && IsNvidia()); - // SwiftShader incorrectly uses depthBias directly when calculating bias. - // TODO(enrico.galli@intel.com): Remove once it has been fixed upstream. - DAWN_SKIP_TEST_IF(IsVulkan() && IsSwiftshader()); - // OpenGL uses a different scale than the other APIs DAWN_SKIP_TEST_IF(IsOpenGL()); @@ -211,10 +199,6 @@ TEST_P(DepthBiasTests, NegativeBiasOnFloat) { // Test adding negative bias to output with a clamp TEST_P(DepthBiasTests, NegativeBiasOnFloatWithClamp) { - // SwiftShader incorrectly uses depthBias directly when calculating bias. - // TODO(enrico.galli@intel.com): Remove once it has been fixed upstream. - DAWN_SKIP_TEST_IF(IsVulkan() && IsSwiftshader()); - // Clamping support in OpenGL is spotty DAWN_SKIP_TEST_IF(IsOpenGL()); @@ -234,10 +218,6 @@ TEST_P(DepthBiasTests, NegativeBiasOnFloatWithClamp) { // Test adding positive infinite slope bias to output TEST_P(DepthBiasTests, PositiveInfinitySlopeBiasOnFloat) { - // SwiftShader incorrectly uses depthBias directly when calculating bias. - // TODO(enrico.galli@intel.com): Remove once it has been fixed upstream. - DAWN_SKIP_TEST_IF(IsVulkan() && IsSwiftshader()); - // NVIDIA GPUs do not clamp values to 1 when using Inf slope bias. DAWN_SKIP_TEST_IF(IsVulkan() && IsNvidia()); @@ -257,10 +237,6 @@ TEST_P(DepthBiasTests, PositiveInfinitySlopeBiasOnFloat) { // Test adding positive infinite slope bias to output TEST_P(DepthBiasTests, NegativeInfinityBiasOnFloat) { - // SwiftShader incorrectly uses depthBias directly when calculating bias. - // TODO(enrico.galli@intel.com): Remove once it has been fixed upstream. - DAWN_SKIP_TEST_IF(IsVulkan() && IsSwiftshader()); - // NVIDIA GPUs do not clamp values to 0 when using -Inf slope bias. DAWN_SKIP_TEST_IF(IsVulkan() && IsNvidia());