aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Lobodzinski <mark@lunarg.com>2016-03-15 09:49:03 -0600
committerMark Lobodzinski <mark@lunarg.com>2016-03-15 14:33:28 -0600
commit66a26ddf9f0d813038f0f0529efd2ab9690d5179 (patch)
treec6d3f0e389b1fcd87bd67e077d77745aedc7049c
parent61b64bd7f2640dedbe89a65db9aaeced3f3d1251 (diff)
downloadusermoji-66a26ddf9f0d813038f0f0529efd2ab9690d5179.tar.xz
layers: Fix crash in core_validation layer
CommandBuffers were getting added to commandPoolMap twice. Change-Id: I115757751ef0aebb1f2599217b3117beca3cd0b7
-rw-r--r--layers/core_validation.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index fbc8607f..f19a5b71 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -6816,7 +6816,9 @@ vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pCr
// Validate command pool
if (dev_data->commandPoolMap.find(pCreateInfo->commandPool) != dev_data->commandPoolMap.end()) {
// Add command buffer to its commandPool map
+#if !MTMERGE
dev_data->commandPoolMap[pCreateInfo->commandPool].commandBuffers.push_back(pCommandBuffer[i]);
+#endif
GLOBAL_CB_NODE *pCB = new GLOBAL_CB_NODE;
// Add command buffer to map
dev_data->commandBufferMap[pCommandBuffer[i]] = pCB;