commit f95d8a2e7d95999a25f3ab4b0264848e32d88e04
author ziga-lunarg <ziga@lunarg.com> Wed Jan 15 19:14:39 2025 +0200
committer spencer-lunarg <spencer@lunarg.com> Wed Jan 29 21:31:40 2025 -0500
tree 5753e2871d7750730066e6a6a1efd5ac36c04daf
parent 207314b25c90e4c3fa3930ffbd35bb2f20aab9bd

layers: Fix crash when sub cb state doesn't have render pass

layers/core_checks/cc_cmd_buffer.cpp

diff --git a/layers/core_checks/cc_cmd_buffer.cpp b/layers/core_checks/cc_cmd_buffer.cpp
index 346b490..6b54f6d 100644
--- a/layers/core_checks/cc_cmd_buffer.cpp
+++ b/layers/core_checks/cc_cmd_buffer.cpp
@@ -886,7 +886,7 @@
         } else {
             if (cb_state.activeRenderPass) {
                 if (cb_state.hasRenderPassInstance && cb_state.activeRenderPass->UsesDynamicRendering() &&
-                    sub_cb_state.activeRenderPass->UsesDynamicRendering()) {
+                    sub_cb_state.activeRenderPass && sub_cb_state.activeRenderPass->UsesDynamicRendering()) {
                     const auto *location_info = vku::FindStructInPNextChain<VkRenderingAttachmentLocationInfo>(
                         sub_cb_state.activeRenderPass->inheritance_rendering_info.pNext);
 

layers/core_checks/cc_render_pass.cpp

diff --git a/layers/core_checks/cc_render_pass.cpp b/layers/core_checks/cc_render_pass.cpp
index 411c9e6..f71e1ff 100644
--- a/layers/core_checks/cc_render_pass.cpp
+++ b/layers/core_checks/cc_render_pass.cpp
@@ -4084,7 +4084,8 @@
          loc.function != Func::vkCmdEndRenderPass && loc.function != Func::vkCmdNextSubpass2 &&
          loc.function != Func::vkCmdNextSubpass2KHR && loc.function != Func::vkCmdEndRenderPass2 &&
          loc.function != Func::vkCmdEndRenderPass2KHR)) {
-        skip |= LogError(vuid, cb_state.Handle(), loc, "cannot be called in a subpass using secondary command buffers.");
+        skip |= LogError(vuid, cb_state.Handle(), loc,
+                         "cannot be called in a subpass using VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS.");
     }
     return skip;
 }