wgsl: Disable broken tests

ShaderRobustnessPerf:
SPIRV-Cross apparently generates incorrect code for MSL and OpenGL, when
attempting to initialize workgroup memory. Disable these tests when not
running with use_tint_generator.

D3D12DescriptorHeapTest:
The UBO layout for a mat2x2 was incorrect, but the test relied upon this.
Temporarily disable the test so we can roll the fix.

Bug: dawn:945
Bug: dawn:946
Change-Id: I810249b26a8a0b583796c0ba63b8a703eb9540e4
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/55248
Auto-Submit: Ben Clayton <bclayton@google.com>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Ben Clayton 2021-06-21 07:55:57 +00:00 committed by Dawn LUCI CQ
parent cea106a1c2
commit e4f4a3711f
2 changed files with 7 additions and 3 deletions

View File

@ -412,6 +412,9 @@ void ShaderRobustnessPerf::SetUp() {
// TODO(crbug.com/tint/904): FXC emits bad output for this test // TODO(crbug.com/tint/904): FXC emits bad output for this test
DAWN_SUPPRESS_TEST_IF(IsD3D12() && !IsDXC() && HasToggleEnabled("use_tint_generator")); DAWN_SUPPRESS_TEST_IF(IsD3D12() && !IsDXC() && HasToggleEnabled("use_tint_generator"));
// TODO(crbug.com/dawn/945): Generation via SPIRV-Cross fails
DAWN_SUPPRESS_TEST_IF(IsOpenGL() || !HasToggleEnabled("use_tint_generator"));
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();

View File

@ -736,7 +736,9 @@ TEST_P(D3D12DescriptorHeapTests, EncodeReuseUBOMultipleSubmits) {
// Verify encoding many sampler and ubo worth of bindgroups. // Verify encoding many sampler and ubo worth of bindgroups.
// Shader-visible heaps should switch out |kNumOfViewHeaps| times. // Shader-visible heaps should switch out |kNumOfViewHeaps| times.
TEST_P(D3D12DescriptorHeapTests, EncodeManyUBOAndSamplers) { // TODO(crbug.com/dawn/946): This test is currently disabled because the UBO
// layout is incorrect. Reenable after next tint roll.
TEST_P(D3D12DescriptorHeapTests, DISABLED_EncodeManyUBOAndSamplers) {
DAWN_TEST_UNSUPPORTED_IF(!mD3DDevice->IsToggleEnabled( DAWN_TEST_UNSUPPORTED_IF(!mD3DDevice->IsToggleEnabled(
dawn_native::Toggle::UseD3D12SmallShaderVisibleHeapForTesting)); dawn_native::Toggle::UseD3D12SmallShaderVisibleHeapForTesting));
@ -812,8 +814,7 @@ TEST_P(D3D12DescriptorHeapTests, EncodeManyUBOAndSamplers) {
wgpu::RenderPipeline pipeline = device.CreateRenderPipeline(&pipelineDescriptor); wgpu::RenderPipeline pipeline = device.CreateRenderPipeline(&pipelineDescriptor);
// Encode a heap worth of descriptors |kNumOfHeaps| times. // Encode a heap worth of descriptors |kNumOfHeaps| times.
constexpr float dummy = 0.0f; constexpr float transform[] = {1.f, 0.f, 0.f, 1.f};
constexpr float transform[] = {1.f, 0.f, dummy, dummy, 0.f, 1.f, dummy, dummy};
wgpu::Buffer transformBuffer = utils::CreateBufferFromData( wgpu::Buffer transformBuffer = utils::CreateBufferFromData(
device, &transform, sizeof(transform), wgpu::BufferUsage::Uniform); device, &transform, sizeof(transform), wgpu::BufferUsage::Uniform);