Skip to content

Commit

Permalink
EMSUSD-59 make error messages more clear
Browse files Browse the repository at this point in the history
Some error checking logging was confusing for the user. Some failures were reported as the cryptic: "Failed verification: ' result == MStatus::kSuccess '".  This leads users to think we are reporting a success. (Technically we were reporting failure to succeed, but the message was worded confusingly.)

Change those failure verification messages to use explicit warning messages instead. This provides clearer failure diagnostics.
  • Loading branch information
pierrebai-adsk committed Sep 6, 2023
1 parent abced0f commit 8b8f5ad
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 27 deletions.
82 changes: 56 additions & 26 deletions lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2242,27 +2242,35 @@ void HdVP2Mesh::_UpdateDrawItem(
MHWRender::MVertexBufferArray vertexBuffers;

std::set<TfToken> addedPrimvars;
auto addPrimvar =
[primvarInfo, &vertexBuffers, &addedPrimvars, isBBoxItem, &sharedBBoxGeom](
const TfToken& p) {
auto entry = primvarInfo->find(p);
if (entry == primvarInfo->cend()) {
// No primvar by that name.
return;
}
MHWRender::MVertexBuffer* primvarBuffer = nullptr;
if (isBBoxItem && p == HdTokens->points) {
primvarBuffer = const_cast<MHWRender::MVertexBuffer*>(
sharedBBoxGeom.GetPositionBuffer());
} else {
primvarBuffer = entry->second->_buffer.get();
}
if (primvarBuffer) { // this filters out the separate color & alpha entries
MStatus result = vertexBuffers.addBuffer(p.GetText(), primvarBuffer);
TF_VERIFY(result == MStatus::kSuccess);
auto addPrimvar = [primvarInfo,
&vertexBuffers,
&addedPrimvars,
isBBoxItem,
&sharedBBoxGeom,
&renderItem](const TfToken& p) {
auto entry = primvarInfo->find(p);
if (entry == primvarInfo->cend()) {
// No primvar by that name.
return;
}
MHWRender::MVertexBuffer* primvarBuffer = nullptr;
if (isBBoxItem && p == HdTokens->points) {
primvarBuffer = const_cast<MHWRender::MVertexBuffer*>(
sharedBBoxGeom.GetPositionBuffer());
} else {
primvarBuffer = entry->second->_buffer.get();
}
if (primvarBuffer) { // this filters out the separate color & alpha entries
MStatus result = vertexBuffers.addBuffer(p.GetText(), primvarBuffer);
if (result != MStatus::kSuccess) {
TF_WARN(
"Could not create primvar [%s] buffer for [%s].",
p.GetText(),
renderItem->name().asChar());
}
addedPrimvars.insert(p);
};
}
addedPrimvars.insert(p);
};

// Points and normals always are at the beginning of vertex requirements:
addPrimvar(HdTokens->points);
Expand All @@ -2288,7 +2296,11 @@ void HdVP2Mesh::_UpdateDrawItem(
// - Trigger consolidation/instancing update.
result = drawScene.setGeometryForRenderItem(
*renderItem, vertexBuffers, *indexBuffer, stateToCommit._boundingBox);
TF_VERIFY(result == MStatus::kSuccess);
if (result != MStatus::kSuccess) {
TF_WARN(
"Could not create OGS geometry for [%s], maybe it has no geometry?",
renderItem->name().asChar());
}
}

// Important, update instance transforms after setting geometry on render items!
Expand All @@ -2306,12 +2318,20 @@ void HdVP2Mesh::_UpdateDrawItem(
// VP2 defines instance ID of the first instance to be 1.
result = drawScene.updateInstanceTransform(
*renderItem, i + 1, (*stateToCommit._instanceTransforms)[i]);
TF_VERIFY(result == MStatus::kSuccess);
if (result != MStatus::kSuccess) {
TF_WARN(
"Could update the instance transform for [%s].",
renderItem->name().asChar());
}
}
} else {
result = drawScene.setInstanceTransformArray(
*renderItem, *stateToCommit._instanceTransforms);
TF_VERIFY(result == MStatus::kSuccess);
if (result != MStatus::kSuccess) {
TF_WARN(
"Could update the instance transform for [%s].",
renderItem->name().asChar());
}
}
}

Expand All @@ -2323,13 +2343,20 @@ void HdVP2Mesh::_UpdateDrawItem(
*renderItem,
stateToCommit._instanceColorParam,
*stateToCommit._instanceColors);
TF_VERIFY(result == MStatus::kSuccess);
if (result != MStatus::kSuccess) {
TF_WARN(
"Could set the instance color for [%s].", renderItem->name().asChar());
}
}
} else if (newInstanceCount >= 1) {
if (stateToCommit._instanceTransforms) {
result = drawScene.setInstanceTransformArray(
*renderItem, *stateToCommit._instanceTransforms);
TF_VERIFY(result == MStatus::kSuccess);
if (result != MStatus::kSuccess) {
TF_WARN(
"Could update the instance transform for [%s].",
renderItem->name().asChar());
}
}

if (stateToCommit._instanceColors && stateToCommit._instanceColors->length() > 0) {
Expand All @@ -2340,7 +2367,10 @@ void HdVP2Mesh::_UpdateDrawItem(
*renderItem,
stateToCommit._instanceColorParam,
*stateToCommit._instanceColors);
TF_VERIFY(result == MStatus::kSuccess);
if (result != MStatus::kSuccess) {
TF_WARN(
"Could set the instance color for [%s].", renderItem->name().asChar());
}
}

stateToCommit._renderItemData._usingInstancedDraw = true;
Expand Down
4 changes: 3 additions & 1 deletion lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,9 @@ void ProxyRenderDelegate::update(MSubSceneContainer& container, const MFrameCont
if (selectionInfo) {
bool oldSnapToSelectedObjects = _snapToSelectedObjects;
_snapToSelectedObjects = selectionInfo->snapToActive(&status);
TF_VERIFY(status == MStatus::kSuccess);
if (status != MStatus::kSuccess) {
TF_WARN("Could snap selected object.");
}
if (_snapToSelectedObjects != oldSnapToSelectedObjects) {
_selectionModeChanged = true;
}
Expand Down

0 comments on commit 8b8f5ad

Please sign in to comment.