commit 539b0225f2987c947edf7438000f2fe7ee58ebc0
author Michael Lentine <mlentine@google.com> Tue Feb 02 17:28:24 2016 -0600
committer Tobin Ehlis <tobine@google.com> Thu Feb 04 11:17:41 2016 -0700
tree 260030b577aeae4d90f88380a502f96f0f195790
parent 3009b62a412049ccc748e69b07c7ba67e6d8ded3

layers: Validate subpass index in begin info is valid.

layers/draw_state.cpp

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 39855d3..06d76f1 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -4389,6 +4389,17 @@
                                         "support precise occlusion queries.", reinterpret_cast<void*>(commandBuffer));
                 }
             }
+            if (pInfo->renderPass != VK_NULL_HANDLE) {
+                auto rp_data = dev_data->renderPassMap.find(pInfo->renderPass);
+                if (rp_data != dev_data->renderPassMap.end() && rp_data->second && rp_data->second->pCreateInfo) {
+                    if (pInfo->subpass >= rp_data->second->pCreateInfo->subpassCount) {
+                        skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, (uint64_t)commandBuffer,
+                            __LINE__, DRAWSTATE_BEGIN_CB_INVALID_STATE, "DS",
+                            "vkBeginCommandBuffer(): Secondary Command Buffers (%p) must has a subpass index (%d) that is less than the number of subpasses (%d).",
+                            (void*)commandBuffer, pInfo->subpass, rp_data->second->pCreateInfo->subpassCount);
+                    }
+                }
+            }
         }
         if (CB_RECORDING == pCB->state) {
             skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, (uint64_t)commandBuffer, __LINE__, DRAWSTATE_BEGIN_CB_INVALID_STATE, "DS",