From fd5fd05db039710c797ee8bac5e6d999173e5fc3 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Tue, 2 Feb 2021 22:01:40 +0000 Subject: [PATCH] Enable EntryPointTests Tint now produces SPIRV that is sufficient for these tests to pass, so re-enabling them. The multiple entry point problem for HLSL mentioned in one of the other skip statements appears to still be a KI, so not removing it. Change-Id: I47005c815dc3cb9093d293e71caa3152c11bf0ac Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/39100 Commit-Queue: Ryan Harrison Auto-Submit: Ryan Harrison Reviewed-by: Austin Eng --- src/tests/end2end/EntryPointTests.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/tests/end2end/EntryPointTests.cpp b/src/tests/end2end/EntryPointTests.cpp index 202b784b5c..6f1f5563a3 100644 --- a/src/tests/end2end/EntryPointTests.cpp +++ b/src/tests/end2end/EntryPointTests.cpp @@ -21,9 +21,8 @@ class EntryPointTests : public DawnTest {}; // Test creating a render pipeline from two entryPoints in the same module. TEST_P(EntryPointTests, FragAndVertexSameModule) { - // TODO: Reenable once Tint is able to produce Vulkan 1.0 / 1.1 SPIR-V. - DAWN_SKIP_TEST_IF(IsVulkan() || IsOpenGL() || IsOpenGLES()); - + // TODO(crbug.com/dawn/658): Crashes on bots + DAWN_SKIP_TEST_IF(IsOpenGL()); wgpu::ShaderModule module = utils::CreateShaderModuleFromWGSL(device, R"( [[builtin(position)]] var Position : vec4; @@ -67,9 +66,6 @@ TEST_P(EntryPointTests, FragAndVertexSameModule) { // Test creating two compute pipelines from the same module. TEST_P(EntryPointTests, TwoComputeInModule) { - // TODO: Reenable once Tint is able to produce Vulkan 1.0 / 1.1 SPIR-V. - DAWN_SKIP_TEST_IF(IsVulkan()); - // TODO: Reenable once Tint's HLSL writer supports multiple entryPoints on a single stage. // https://crbug.com/tint/297 DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator"));