Skip to content

Commit f95d8a2

Browse files
ziga-lunargspencer-lunarg
authored andcommitted
layers: Fix crash when sub cb state doesn't have render pass
1 parent 207314b commit f95d8a2

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

layers/core_checks/cc_cmd_buffer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ bool CoreChecks::PreCallValidateCmdExecuteCommands(VkCommandBuffer commandBuffer
886886
} else {
887887
if (cb_state.activeRenderPass) {
888888
if (cb_state.hasRenderPassInstance && cb_state.activeRenderPass->UsesDynamicRendering() &&
889-
sub_cb_state.activeRenderPass->UsesDynamicRendering()) {
889+
sub_cb_state.activeRenderPass && sub_cb_state.activeRenderPass->UsesDynamicRendering()) {
890890
const auto *location_info = vku::FindStructInPNextChain<VkRenderingAttachmentLocationInfo>(
891891
sub_cb_state.activeRenderPass->inheritance_rendering_info.pNext);
892892

layers/core_checks/cc_render_pass.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4084,7 +4084,8 @@ bool CoreChecks::ValidateCmdSubpassState(const vvl::CommandBuffer &cb_state, con
40844084
loc.function != Func::vkCmdEndRenderPass && loc.function != Func::vkCmdNextSubpass2 &&
40854085
loc.function != Func::vkCmdNextSubpass2KHR && loc.function != Func::vkCmdEndRenderPass2 &&
40864086
loc.function != Func::vkCmdEndRenderPass2KHR)) {
4087-
skip |= LogError(vuid, cb_state.Handle(), loc, "cannot be called in a subpass using secondary command buffers.");
4087+
skip |= LogError(vuid, cb_state.Handle(), loc,
4088+
"cannot be called in a subpass using VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS.");
40884089
}
40894090
return skip;
40904091
}

0 commit comments

Comments
 (0)