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

Add validation on blend factors and blend operations 

This patch adds validations on blend factors and blend
operations according to the latest WebGPU SPEC:
If component.operation is "min" or "max":
component.srcFactor and component.dstFactor must both
be "one".

BUG=dawn:1257
TEST=dawn_unittests

Change-Id: Id17c06044900eb0fa8d2ebab6fd3132f9deb157a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/76480
Reviewed-by: Loko Kung <lokokung@google.com>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
This commit is contained in:
Jiawei Shao 2022-01-21 02:05:47 +00:00 committed by Dawn LUCI CQ
parent 18bad60adf
commit 3619a2b017
2 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dawn_native/RenderPipeline.cpp
View File

@ -317,6 +317,18 @@ namespace dawn::native {
return {}; return {};
} }
MaybeError ValidateBlendComponent(BlendComponent blendComponent) {
if (blendComponent.operation == wgpu::BlendOperation::Min ||
blendComponent.operation == wgpu::BlendOperation::Max) {
DAWN_INVALID_IF(blendComponent.srcFactor != wgpu::BlendFactor::One ||
blendComponent.dstFactor != wgpu::BlendFactor::One,
"Blend factor is not %s when blend operation is %s.",
wgpu::BlendFactor::One, blendComponent.operation);
}
return {};
}
MaybeError ValidateBlendState(DeviceBase* device, const BlendState* descriptor) { MaybeError ValidateBlendState(DeviceBase* device, const BlendState* descriptor) {
DAWN_TRY(ValidateBlendOperation(descriptor->alpha.operation)); DAWN_TRY(ValidateBlendOperation(descriptor->alpha.operation));
DAWN_TRY(ValidateBlendFactor(descriptor->alpha.srcFactor)); DAWN_TRY(ValidateBlendFactor(descriptor->alpha.srcFactor));
@ -324,6 +336,9 @@ namespace dawn::native {
DAWN_TRY(ValidateBlendOperation(descriptor->color.operation)); DAWN_TRY(ValidateBlendOperation(descriptor->color.operation));
DAWN_TRY(ValidateBlendFactor(descriptor->color.srcFactor)); DAWN_TRY(ValidateBlendFactor(descriptor->color.srcFactor));
DAWN_TRY(ValidateBlendFactor(descriptor->color.dstFactor)); DAWN_TRY(ValidateBlendFactor(descriptor->color.dstFactor));
DAWN_TRY(ValidateBlendComponent(descriptor->alpha));
DAWN_TRY(ValidateBlendComponent(descriptor->color));
return {}; return {};
} }

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

@ -403,6 +403,54 @@ TEST_F(RenderPipelineValidationTest, FragmentOutputComponentCountCompatibility)
} }
} }
// Tests that when blendOperationMinOrMax is "min" or "max", both srcBlendFactor and dstBlendFactor
// must be "one".
TEST_F(RenderPipelineValidationTest, BlendOperationAndBlendFactors) {
constexpr std::array<wgpu::BlendFactor, 8> kBlendFactors = {wgpu::BlendFactor::Zero,
wgpu::BlendFactor::One,
wgpu::BlendFactor::SrcAlpha,
wgpu::BlendFactor::OneMinusSrcAlpha,
wgpu::BlendFactor::Src,
wgpu::BlendFactor::DstAlpha,
wgpu::BlendFactor::OneMinusDstAlpha,
wgpu::BlendFactor::Dst};
constexpr std::array<wgpu::BlendOperation, 2> kBlendOperationsForTest = {
wgpu::BlendOperation::Max, wgpu::BlendOperation::Min};
for (wgpu::BlendOperation blendOperationMinOrMax : kBlendOperationsForTest) {
for (wgpu::BlendFactor srcFactor : kBlendFactors) {
for (wgpu::BlendFactor dstFactor : kBlendFactors) {
utils::ComboRenderPipelineDescriptor descriptor;
descriptor.vertex.module = vsModule;
descriptor.cFragment.module = fsModule;
descriptor.cTargets[0].format = wgpu::TextureFormat::RGBA8Unorm;
descriptor.cTargets[0].blend = &descriptor.cBlends[0];
descriptor.cBlends[0].color.srcFactor = srcFactor;
descriptor.cBlends[0].color.dstFactor = dstFactor;
descriptor.cBlends[0].alpha.srcFactor = srcFactor;
descriptor.cBlends[0].alpha.dstFactor = dstFactor;
descriptor.cBlends[0].color.operation = blendOperationMinOrMax;
descriptor.cBlends[0].alpha.operation = wgpu::BlendOperation::Add;
if (srcFactor == wgpu::BlendFactor::One && dstFactor == wgpu::BlendFactor::One) {
device.CreateRenderPipeline(&descriptor);
} else {
ASSERT_DEVICE_ERROR(device.CreateRenderPipeline(&descriptor));
}
descriptor.cBlends[0].color.operation = wgpu::BlendOperation::Add;
descriptor.cBlends[0].alpha.operation = blendOperationMinOrMax;
if (srcFactor == wgpu::BlendFactor::One && dstFactor == wgpu::BlendFactor::One) {
device.CreateRenderPipeline(&descriptor);
} else {
ASSERT_DEVICE_ERROR(device.CreateRenderPipeline(&descriptor));
}
}
}
}
}
/// Tests that the sample count of the render pipeline must be valid. /// Tests that the sample count of the render pipeline must be valid.
TEST_F(RenderPipelineValidationTest, SampleCount) { TEST_F(RenderPipelineValidationTest, SampleCount) {
{ {