diff --git a/DEPS b/DEPS index 3d47dab53f..adb478d687 100644 --- a/DEPS +++ b/DEPS @@ -66,7 +66,7 @@ deps = { # SPIRV-Cross 'third_party/spirv-cross': { - 'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@0376576d2dc0721edfb2c5a0257fdc275f6f39dc', + 'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@f5e9f4a1722ecd383aa5b1877c3ada544edd8b00', 'condition': 'dawn_standalone', }, diff --git a/src/tests/end2end/MultisampledRenderingTests.cpp b/src/tests/end2end/MultisampledRenderingTests.cpp index 2235040110..fb051bbcb5 100644 --- a/src/tests/end2end/MultisampledRenderingTests.cpp +++ b/src/tests/end2end/MultisampledRenderingTests.cpp @@ -695,9 +695,6 @@ TEST_P(MultisampledRenderingTest, MultisampledRenderingWithDepthTestAndSampleMas // Test using one multisampled color attachment with resolve target can render correctly // with non-default sample mask and shader-output mask. TEST_P(MultisampledRenderingTest, ResolveInto2DTextureWithSampleMaskAndShaderOutputMask) { - // TODO(dawn:491): Remove this when SPIRV-cross adds support for SV_Coverage in HLSL. - DAWN_SKIP_TEST_IF(IsD3D12()); - constexpr bool kTestDepth = false; wgpu::CommandEncoder commandEncoder = device.CreateCommandEncoder(); @@ -747,9 +744,6 @@ TEST_P(MultisampledRenderingTest, ResolveInto2DTextureWithSampleMaskAndShaderOut // Test doing MSAA resolve into multiple resolve targets works correctly with a non-default // shader-output mask. TEST_P(MultisampledRenderingTest, ResolveIntoMultipleResolveTargetsWithShaderOutputMask) { - // TODO(dawn:491): Remove this when SPIRV-cross adds support for SV_Coverage in HLSL. - DAWN_SKIP_TEST_IF(IsD3D12()); - wgpu::TextureView multisampledColorView2 = CreateTextureForOutputAttachment(kColorFormat, kSampleCount).CreateView(); wgpu::Texture resolveTexture2 = CreateTextureForOutputAttachment(kColorFormat, 1);