From 20626f8efae394d0264764739a8e37c9f112cfa6 Mon Sep 17 00:00:00 2001
From: Mark Lobodzinski <mark@lunarg.com>
Date: Thu, 19 Nov 2015 13:22:11 -0700
Subject: layers: LX206, properly restore command buffer level on a reset

---
 layers/draw_state.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'layers/draw_state.cpp')

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index d0c84ead..8f8cad53 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -1534,7 +1534,6 @@ static void resetCB(layer_data* my_data, const VkCommandBuffer cb)
         pCB->activeRenderPass = 0;
         pCB->activeSubpass = 0;
         pCB->framebuffer = 0;
-        pCB->level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
         pCB->boundDescriptorSets.clear();
         pCB->imageLayoutMap.clear();
         pCB->lastVtxBinding = MAX_BINDING;
@@ -2529,7 +2528,6 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkAllocateCommandBuffers(VkDevice
                 resetCB(dev_data, pCommandBuffer[i]);
                 pCB->commandBuffer = pCommandBuffer[i];
                 pCB->createInfo    = *pCreateInfo;
-                pCB->level         = pCreateInfo->level;
                 updateCBTracking(pCB);
             }
         }
@@ -2544,7 +2542,7 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkBeginCommandBuffer(VkCommandBuf
     // Validate command buffer level
     GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer);
     if (pCB) {
-        if (pCB->level == VK_COMMAND_BUFFER_LEVEL_PRIMARY) {
+        if (pCB->createInfo.level == VK_COMMAND_BUFFER_LEVEL_PRIMARY) {
             if (pBeginInfo->renderPass || pBeginInfo->framebuffer) {
                 // These should be NULL for a Primary CB
                 skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_BEGIN_CB_INVALID_STATE, "DS",
-- 
cgit v1.2.3