mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-06-06 06:33:30 +00:00
Remove test suppressions due to SPIRV-Cross
Bug: dawn:259, dawn:945, dawn:571 Change-Id: I0c6da9c186697396c42a7e6416b9f66c51440633 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88002 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Loko Kung <lokokung@google.com> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
parent
98bdc7b28c
commit
646ba4e716
@ -728,18 +728,10 @@ TEST_P(MultisampledRenderingTest, MultisampledRenderingWithDepthTestAndSampleMas
|
|||||||
// Test using one multisampled color attachment with resolve target can render correctly
|
// Test using one multisampled color attachment with resolve target can render correctly
|
||||||
// with non-default sample mask and shader-output mask.
|
// with non-default sample mask and shader-output mask.
|
||||||
TEST_P(MultisampledRenderingTest, ResolveInto2DTextureWithSampleMaskAndShaderOutputMask) {
|
TEST_P(MultisampledRenderingTest, ResolveInto2DTextureWithSampleMaskAndShaderOutputMask) {
|
||||||
// TODO(github.com/KhronosGroup/SPIRV-Cross/issues/1626): SPIRV-Cross produces bad GLSL for
|
|
||||||
// unsigned SampleMask builtins
|
|
||||||
DAWN_SUPPRESS_TEST_IF(IsOpenGL() || IsOpenGLES());
|
|
||||||
|
|
||||||
// TODO(crbug.com/dawn/673): Work around or enforce via validation that sample variables are not
|
// TODO(crbug.com/dawn/673): Work around or enforce via validation that sample variables are not
|
||||||
// supported on some platforms.
|
// supported on some platforms.
|
||||||
DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_sample_variables"));
|
DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_sample_variables"));
|
||||||
|
|
||||||
// TODO(crbug.com/dawn/571): Fails on Metal / D3D12 because SPIRV-Cross produces bad shaders
|
|
||||||
// for the SPIR-V outputted by Tint. Reenable once we use Tint's MSL / HLSL generators.
|
|
||||||
DAWN_SUPPRESS_TEST_IF(IsD3D12() || IsMetal());
|
|
||||||
|
|
||||||
constexpr bool kTestDepth = false;
|
constexpr bool kTestDepth = false;
|
||||||
wgpu::CommandEncoder commandEncoder = device.CreateCommandEncoder();
|
wgpu::CommandEncoder commandEncoder = device.CreateCommandEncoder();
|
||||||
|
|
||||||
@ -790,18 +782,10 @@ TEST_P(MultisampledRenderingTest, ResolveInto2DTextureWithSampleMaskAndShaderOut
|
|||||||
// Test doing MSAA resolve into multiple resolve targets works correctly with a non-default
|
// Test doing MSAA resolve into multiple resolve targets works correctly with a non-default
|
||||||
// shader-output mask.
|
// shader-output mask.
|
||||||
TEST_P(MultisampledRenderingTest, ResolveIntoMultipleResolveTargetsWithShaderOutputMask) {
|
TEST_P(MultisampledRenderingTest, ResolveIntoMultipleResolveTargetsWithShaderOutputMask) {
|
||||||
// TODO(github.com/KhronosGroup/SPIRV-Cross/issues/1626): SPIRV-Cross produces bad GLSL for
|
|
||||||
// unsigned SampleMask builtins
|
|
||||||
DAWN_SUPPRESS_TEST_IF(IsOpenGL() || IsOpenGLES());
|
|
||||||
|
|
||||||
// TODO(crbug.com/dawn/673): Work around or enforce via validation that sample variables are not
|
// TODO(crbug.com/dawn/673): Work around or enforce via validation that sample variables are not
|
||||||
// supported on some platforms.
|
// supported on some platforms.
|
||||||
DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_sample_variables"));
|
DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_sample_variables"));
|
||||||
|
|
||||||
// TODO(crbug.com/dawn/571): Fails on Metal / D3D12 because SPIRV-Cross produces bad shaders
|
|
||||||
// for the SPIR-V outputted by Tint. Reenable once we use Tint's MSL / HLSL generators.
|
|
||||||
DAWN_SUPPRESS_TEST_IF(IsD3D12() || IsMetal());
|
|
||||||
|
|
||||||
wgpu::TextureView multisampledColorView2 =
|
wgpu::TextureView multisampledColorView2 =
|
||||||
CreateTextureForRenderAttachment(kColorFormat, kSampleCount).CreateView();
|
CreateTextureForRenderAttachment(kColorFormat, kSampleCount).CreateView();
|
||||||
wgpu::Texture resolveTexture2 = CreateTextureForRenderAttachment(kColorFormat, 1);
|
wgpu::Texture resolveTexture2 = CreateTextureForRenderAttachment(kColorFormat, 1);
|
||||||
|
@ -51,10 +51,6 @@ class VertexFormatTest : public DawnTest {
|
|||||||
protected:
|
protected:
|
||||||
void SetUp() override {
|
void SetUp() override {
|
||||||
DawnTest::SetUp();
|
DawnTest::SetUp();
|
||||||
|
|
||||||
// TODO(crbug.com/dawn/259): Failing because of a SPIRV-Cross issue.
|
|
||||||
DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel());
|
|
||||||
|
|
||||||
renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
|
renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -410,9 +410,6 @@ void ShaderRobustnessPerf::SetUp() {
|
|||||||
// TODO(crbug.com/dawn/786): D3D12_Microsoft_Basic_Render_Driver_CPU
|
// TODO(crbug.com/dawn/786): D3D12_Microsoft_Basic_Render_Driver_CPU
|
||||||
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsWARP());
|
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsWARP());
|
||||||
|
|
||||||
// TODO(crbug.com/dawn/945): Generation via SPIRV-Cross fails
|
|
||||||
DAWN_SUPPRESS_TEST_IF(IsOpenGL());
|
|
||||||
|
|
||||||
const size_t dataASize = mDimAOuter * mDimInner;
|
const size_t dataASize = mDimAOuter * mDimInner;
|
||||||
std::vector<float> dataA(dataASize);
|
std::vector<float> dataA(dataASize);
|
||||||
uint64_t byteASize = sizeof(float) * dataA.size();
|
uint64_t byteASize = sizeof(float) * dataA.size();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user