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

Only allow CompareFunction::Undefined for samplerDesc.compare 

The various backends hit UNREACHABLE() during pipeline creation if
depthStencil.depthCompare (or likewise for stencil) are set to
undefined.

Bug: chromium:1195694
Change-Id: Ibf4d8d47b4c98343dce3caccdf79ee90c0de899f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/46863
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
Corentin Wallez 2021-04-08 18:42:47 +00:00 committed by Commit Bot service account
parent 1e45c5e764
commit 5d2f2042de
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dawn.json
View File

@ -490,7 +490,7 @@
"compare function": { "compare function": {
"category": "enum", "category": "enum",
"values": [ "values": [
{"value": 0, "name": "undefined", "jsrepr": "undefined"}, {"value": 0, "name": "undefined", "jsrepr": "undefined", "valid": false},
{"value": 1, "name": "never"}, {"value": 1, "name": "never"},
{"value": 2, "name": "less"}, {"value": 2, "name": "less"},
{"value": 3, "name": "less equal"}, {"value": 3, "name": "less equal"},

7
src/dawn_native/Sampler.cpp
View File

@ -58,7 +58,14 @@ namespace dawn_native {
DAWN_TRY(ValidateAddressMode(descriptor->addressModeU)); DAWN_TRY(ValidateAddressMode(descriptor->addressModeU));
DAWN_TRY(ValidateAddressMode(descriptor->addressModeV)); DAWN_TRY(ValidateAddressMode(descriptor->addressModeV));
DAWN_TRY(ValidateAddressMode(descriptor->addressModeW)); DAWN_TRY(ValidateAddressMode(descriptor->addressModeW));
// CompareFunction::Undefined is tagged as invalid because it can't be used, except for the
// SamplerDescriptor where it is a special value that means the sampler is not a
// comparison-sampler.
if (descriptor->compare != wgpu::CompareFunction::Undefined) {
DAWN_TRY(ValidateCompareFunction(descriptor->compare)); DAWN_TRY(ValidateCompareFunction(descriptor->compare));
}
return {}; return {};
} }

16
src/tests/unittests/validation/RenderPipelineValidationTests.cpp
View File

@ -572,6 +572,22 @@ TEST_F(RenderPipelineValidationTest, ClampDepthWithoutExtension) {
} }
} }
// Test that depthStencil.depthCompare must not be undefiend.
TEST_F(RenderPipelineValidationTest, DepthCompareUndefinedIsError) {
utils::ComboRenderPipelineDescriptor2 descriptor;
descriptor.vertex.module = vsModule;
descriptor.cFragment.module = fsModule;
descriptor.EnableDepthStencil(wgpu::TextureFormat::Depth32Float);
// Control case: Always is valid.
descriptor.cDepthStencil.depthCompare = wgpu::CompareFunction::Always;
device.CreateRenderPipeline2(&descriptor);
// Error case: Undefined is invalid.
descriptor.cDepthStencil.depthCompare = wgpu::CompareFunction::Undefined;
ASSERT_DEVICE_ERROR(device.CreateRenderPipeline2(&descriptor));
}
// Test that the entryPoint names must be present for the correct stage in the shader module. // Test that the entryPoint names must be present for the correct stage in the shader module.
TEST_F(RenderPipelineValidationTest, EntryPointNameValidation) { TEST_F(RenderPipelineValidationTest, EntryPointNameValidation) {
wgpu::ShaderModule module = utils::CreateShaderModule(device, R"( wgpu::ShaderModule module = utils::CreateShaderModule(device, R"(