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

Dawn: Improve a couple error messages. 

Bug: dawn:563
Change-Id: I49ad645d1b8a02efe029c391c3c70894de42cf9d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/121542
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez 2023-02-27 15:10:21 +00:00 committed by Dawn LUCI CQ
parent 9efc12d4af
commit f615770780
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dawn/native/CommandBufferStateTracker.cpp
View File

@ -425,6 +425,7 @@ MaybeError CommandBufferStateTracker::CheckMissingAspects(ValidationAspects aspe
}
if (aspects[VALIDATION_ASPECT_VERTEX_BUFFERS]) {
// Try to be helpful by finding one missing vertex buffer to surface in the error message.
const ityp::bitset<VertexBufferSlot, kMaxVertexBuffers> missingVertexBuffers =
GetRenderPipeline()->GetVertexBufferSlotsUsed() & ~mVertexBufferSlotsUsed;
ASSERT(missingVertexBuffers.any());

17
src/dawn/native/RenderPipeline.cpp
View File

@ -157,9 +157,20 @@ MaybeError ValidateVertexState(DeviceBase* device,
// attribute number never exceed kMaxVertexAttributes.
ASSERT(totalAttributesNum <= kMaxVertexAttributes);
// TODO(dawn:563): Specify which inputs were not used in error message.
DAWN_INVALID_IF(!IsSubset(vertexMetadata.usedVertexInputs, attributesSetMask),
"Pipeline vertex stage uses vertex buffers not in the vertex state");
// Validate that attributes used by the VertexState are in the shader using bitmask operations
// but try to be helpful by finding one missing attribute to surface in the error message
if (!IsSubset(vertexMetadata.usedVertexInputs, attributesSetMask)) {
const ityp::bitset<VertexAttributeLocation, kMaxVertexAttributes> missingAttributes =
vertexMetadata.usedVertexInputs & ~attributesSetMask;
ASSERT(missingAttributes.any());
VertexAttributeLocation firstMissing = ityp::Sub(
GetHighestBitIndexPlusOne(missingAttributes), VertexAttributeLocation(uint8_t(1)));
return DAWN_VALIDATION_ERROR(
"Vertex attribute slot %u used in (%s, entryPoint: %s) is not present in the "
"VertexState.",
uint8_t(firstMissing), descriptor->module, descriptor->entryPoint);
}
return {};
}

13
src/dawn/native/ShaderModule.cpp
View File

@ -395,21 +395,18 @@ MaybeError ValidateCompatibilityOfSingleBindingWithLayout(const DeviceBase* devi
BindingIndex bindingIndex(bindingIt->second);
const BindingInfo& layoutInfo = layout->GetBindingInfo(bindingIndex);
// TODO(dawn:563): Provide info about the binding types.
DAWN_INVALID_IF(
layoutInfo.bindingType != shaderInfo.bindingType,
"Binding type (buffer vs. texture vs. sampler vs. external) doesn't match the type "
"in the layout.");
DAWN_INVALID_IF(layoutInfo.bindingType != shaderInfo.bindingType,
"Binding type in the shader (%s) doesn't match the type in the layout (%s).",
shaderInfo.bindingType, layoutInfo.bindingType);
ExternalTextureBindingExpansionMap expansions = layout->GetExternalTextureBindingExpansionMap();
DAWN_INVALID_IF(expansions.find(bindingNumber) != expansions.end(),
"Binding type (buffer vs. texture vs. sampler vs. external) doesn't "
"match the type in the layout.");
// TODO(dawn:563): Provide info about the visibility.
DAWN_INVALID_IF((layoutInfo.visibility & StageBit(entryPointStage)) == 0,
"Entry point's stage is not in the binding visibility in the layout (%s)",
layoutInfo.visibility);
"Entry point's stage (%s) is not in the binding visibility in the layout (%s).",
StageBit(entryPointStage), layoutInfo.visibility);
switch (layoutInfo.bindingType) {
case BindingInfoType::Texture: {