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

Validate usage of dynamic at the BGL level. 

Previously validation of the combination of dynamic with the binding
type was only done when creating the bind group when it should have been
done when the bind group layout is created.

BUG=dawn:55

Change-Id: I976f7e052f9737929fc05908af50e6ad5ceef397
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/8861
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez 2019-07-15 10:29:08 +00:00 committed by Commit Bot service account
parent 5de3e0aaa4
commit d757c300a4
3 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dawn_native/BindGroup.cpp
View File

@ -132,17 +132,10 @@ namespace dawn_native {
DAWN_TRY(ValidateBufferBinding(device, binding, dawn::BufferUsageBit::Storage));
break;
case dawn::BindingType::SampledTexture:
if (layoutInfo.dynamic[bindingIndex]) {
return DAWN_VALIDATION_ERROR(
"SampledTextures are expected to be not dynamic");
}
DAWN_TRY(
ValidateTextureBinding(device, binding, dawn::TextureUsageBit::Sampled));
break;
case dawn::BindingType::Sampler:
if (layoutInfo.dynamic[bindingIndex]) {
return DAWN_VALIDATION_ERROR("Samplers are expected to be not dynamic");
}
DAWN_TRY(ValidateSamplerBinding(device, binding));
break;
}

15
src/dawn_native/BindGroupLayout.cpp
View File

@ -31,7 +31,7 @@ namespace dawn_native {
std::bitset<kMaxBindingsPerGroup> bindingsSet;
for (uint32_t i = 0; i < descriptor->bindingCount; ++i) {
auto& binding = descriptor->bindings[i];
const BindGroupLayoutBinding& binding = descriptor->bindings[i];
DAWN_TRY(ValidateShaderStageBit(binding.visibility));
DAWN_TRY(ValidateBindingType(binding.type));
@ -41,6 +41,19 @@ namespace dawn_native {
if (bindingsSet[binding.binding]) {
return DAWN_VALIDATION_ERROR("some binding index was specified more than once");
}
switch (binding.type) {
case dawn::BindingType::UniformBuffer:
case dawn::BindingType::StorageBuffer:
break;
case dawn::BindingType::SampledTexture:
case dawn::BindingType::Sampler:
if (binding.dynamic) {
return DAWN_VALIDATION_ERROR("Samplers and textures cannot be dynamic");
}
break;
}
bindingsSet.set(binding.binding);
}
return {};

24
src/tests/unittests/validation/BindGroupValidationTests.cpp
View File

@ -422,13 +422,35 @@ TEST_F(BindGroupLayoutValidationTest, BindGroupLayoutBindingOOB) {
// This test verifies that the BindGroupLayout bindings are correctly validated, even if the
// binding ids are out-of-order.
TEST_F(BindGroupLayoutValidationTest, BindGroupBinding) {
auto layout = utils::MakeBindGroupLayout(
utils::MakeBindGroupLayout(
device, {
{1, dawn::ShaderStageBit::Vertex, dawn::BindingType::UniformBuffer},
{0, dawn::ShaderStageBit::Vertex, dawn::BindingType::UniformBuffer},
});
}
// Check that dynamic = true is only allowed with buffer bindings.
TEST_F(BindGroupLayoutValidationTest, DynamicAndTypeCompatibility) {
utils::MakeBindGroupLayout(
device, {
{0, dawn::ShaderStageBit::Compute, dawn::BindingType::UniformBuffer, true},
});
utils::MakeBindGroupLayout(
device, {
{0, dawn::ShaderStageBit::Compute, dawn::BindingType::StorageBuffer, true},
});
ASSERT_DEVICE_ERROR(utils::MakeBindGroupLayout(
device, {
{0, dawn::ShaderStageBit::Compute, dawn::BindingType::SampledTexture, true},
}));
ASSERT_DEVICE_ERROR(utils::MakeBindGroupLayout(
device, {
{0, dawn::ShaderStageBit::Compute, dawn::BindingType::Sampler, true},
}));
}
// This test verifies that the BindGroupLayout cache is successfully caching/deduplicating objects.
//