aboutsummaryrefslogtreecommitdiff
path: root/layers/draw_state.cpp
diff options
context:
space:
mode:
authorMark Lobodzinski <mark@lunarg.com>2015-11-19 13:22:11 -0700
committerMark Lobodzinski <mark@lunarg.com>2015-11-19 13:24:41 -0700
commit20626f8efae394d0264764739a8e37c9f112cfa6 (patch)
tree48999e713e31a6e828b5a61d493377f4bd6b6ee4 /layers/draw_state.cpp
parent2df3d941cef7419a3969c3d84b23514ad0e5386d (diff)
downloadusermoji-20626f8efae394d0264764739a8e37c9f112cfa6.tar.xz
layers: LX206, properly restore command buffer level on a reset
Diffstat (limited to 'layers/draw_state.cpp')
-rw-r--r--layers/draw_state.cpp4
1 files changed, 1 insertions, 3 deletions
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",