encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Validate that depth clear values are between 0, 1 

Fixes missing validation exposed by the addition of
https://github.com/gpuweb/cts/pull/1640 to the CTS.

Change-Id: Ib51124603a6fcec973eeab9ac1ed989add209c9a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/96481
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Brandon Jones <bajones@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Brandon Jones 2022-07-20 04:18:35 +00:00 committed by Dawn LUCI CQ
parent 6bb4e1aeff
commit 81768c131f
2 changed files with 64 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dawn/native/CommandEncoder.cpp
View File

@ -382,10 +382,16 @@ MaybeError ValidateRenderPassDepthStencilAttachment(
if (!std::isnan(depthStencilAttachment->clearDepth)) { if (!std::isnan(depthStencilAttachment->clearDepth)) {
// TODO(dawn:1269): Remove this branch after the deprecation period. // TODO(dawn:1269): Remove this branch after the deprecation period.
device->EmitDeprecationWarning("clearDepth is deprecated, prefer depthClearValue instead."); device->EmitDeprecationWarning("clearDepth is deprecated, prefer depthClearValue instead.");
} else { DAWN_INVALID_IF(
DAWN_INVALID_IF(depthStencilAttachment->depthLoadOp == wgpu::LoadOp::Clear && depthStencilAttachment->clearDepth < 0.0f || depthStencilAttachment->clearDepth > 1.0f,
std::isnan(depthStencilAttachment->depthClearValue), "clearDepth is not between 0.0 and 1.0");
} else if (depthStencilAttachment->depthLoadOp == wgpu::LoadOp::Clear) {
DAWN_INVALID_IF(std::isnan(depthStencilAttachment->depthClearValue),
"depthClearValue is NaN."); "depthClearValue is NaN.");
DAWN_INVALID_IF(depthStencilAttachment->depthClearValue < 0.0f ||
depthStencilAttachment->depthClearValue > 1.0f,
"depthClearValue is not between 0.0 and 1.0");
} }
// TODO(dawn:1269): Remove after the deprecation period. // TODO(dawn:1269): Remove after the deprecation period.

57
src/dawn/tests/unittests/validation/RenderPassDescriptorValidationTests.cpp
View File

@ -1057,7 +1057,7 @@ TEST_F(RenderPassDescriptorValidationTest, UseNaNOrINFINITYAsColorOrDepthClearVa
AssertBeginRenderPassError(&renderPass); AssertBeginRenderPassError(&renderPass);
} }
// Tests that INFINITY can be used in depthClearValue. // Tests that INFINITY cannot be used in depthClearValue.
{ {
wgpu::TextureView depth = wgpu::TextureView depth =
Create2DAttachment(device, 1, 1, wgpu::TextureFormat::Depth24Plus); Create2DAttachment(device, 1, 1, wgpu::TextureFormat::Depth24Plus);
@ -1065,13 +1065,66 @@ TEST_F(RenderPassDescriptorValidationTest, UseNaNOrINFINITYAsColorOrDepthClearVa
renderPass.cDepthStencilAttachmentInfo.stencilLoadOp = wgpu::LoadOp::Undefined; renderPass.cDepthStencilAttachmentInfo.stencilLoadOp = wgpu::LoadOp::Undefined;
renderPass.cDepthStencilAttachmentInfo.stencilStoreOp = wgpu::StoreOp::Undefined; renderPass.cDepthStencilAttachmentInfo.stencilStoreOp = wgpu::StoreOp::Undefined;
renderPass.cDepthStencilAttachmentInfo.depthClearValue = INFINITY; renderPass.cDepthStencilAttachmentInfo.depthClearValue = INFINITY;
AssertBeginRenderPassSuccess(&renderPass); AssertBeginRenderPassError(&renderPass);
} }
// TODO(https://crbug.com/dawn/666): Add a test case for clearStencil for stencilOnly // TODO(https://crbug.com/dawn/666): Add a test case for clearStencil for stencilOnly
// once stencil8 is supported. // once stencil8 is supported.
} }
// Tests that depth clear values mut be between 0 and 1, inclusive.
TEST_F(RenderPassDescriptorValidationTest, ValidateDepthClearValueRange) {
wgpu::TextureView depth = Create2DAttachment(device, 1, 1, wgpu::TextureFormat::Depth24Plus);
utils::ComboRenderPassDescriptor renderPass({}, depth);
renderPass.cDepthStencilAttachmentInfo.stencilLoadOp = wgpu::LoadOp::Undefined;
renderPass.cDepthStencilAttachmentInfo.stencilStoreOp = wgpu::StoreOp::Undefined;
// 0, 1, and any value in between are be valid.
renderPass.cDepthStencilAttachmentInfo.depthClearValue = 0;
AssertBeginRenderPassSuccess(&renderPass);
renderPass.cDepthStencilAttachmentInfo.depthClearValue = 0.1;
AssertBeginRenderPassSuccess(&renderPass);
renderPass.cDepthStencilAttachmentInfo.depthClearValue = 0.5;
AssertBeginRenderPassSuccess(&renderPass);
renderPass.cDepthStencilAttachmentInfo.depthClearValue = 0.82;
AssertBeginRenderPassSuccess(&renderPass);
renderPass.cDepthStencilAttachmentInfo.depthClearValue = 1;
AssertBeginRenderPassSuccess(&renderPass);
// Values less than 0 or greater than 1 are invalid.
renderPass.cDepthStencilAttachmentInfo.depthClearValue = -1;
AssertBeginRenderPassError(&renderPass);
renderPass.cDepthStencilAttachmentInfo.depthClearValue = 2;
AssertBeginRenderPassError(&renderPass);
renderPass.cDepthStencilAttachmentInfo.depthClearValue = -0.001;
AssertBeginRenderPassError(&renderPass);
renderPass.cDepthStencilAttachmentInfo.depthClearValue = 1.001;
AssertBeginRenderPassError(&renderPass);
// Clear values are not validated if the depthLoadOp is Load.
renderPass.cDepthStencilAttachmentInfo.depthLoadOp = wgpu::LoadOp::Load;
renderPass.cDepthStencilAttachmentInfo.depthClearValue = -1;
AssertBeginRenderPassSuccess(&renderPass);
renderPass.cDepthStencilAttachmentInfo.depthClearValue = 2;
AssertBeginRenderPassSuccess(&renderPass);
renderPass.cDepthStencilAttachmentInfo.depthClearValue = -0.001;
AssertBeginRenderPassSuccess(&renderPass);
renderPass.cDepthStencilAttachmentInfo.depthClearValue = 1.001;
AssertBeginRenderPassSuccess(&renderPass);
}
TEST_F(RenderPassDescriptorValidationTest, ValidateDepthStencilReadOnly) { TEST_F(RenderPassDescriptorValidationTest, ValidateDepthStencilReadOnly) {
wgpu::TextureView colorView = Create2DAttachment(device, 1, 1, wgpu::TextureFormat::RGBA8Unorm); wgpu::TextureView colorView = Create2DAttachment(device, 1, 1, wgpu::TextureFormat::RGBA8Unorm);
wgpu::TextureView depthStencilView = wgpu::TextureView depthStencilView =