layers: Don't make a mess of partial pipeline creation failure

Previously we'd end up with a VK_NULL_HANDLE -> junk PIPELINE_STATE
mapping, which confuses other things.

Signed-off-by: Chris Forbes <chrisforbes@google.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 729de863..5e0a7c93 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -6879,8 +6879,13 @@ CreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t
     auto result = dev_data->dispatch_table.CreateGraphicsPipelines(device, pipelineCache, count, pCreateInfos, pAllocator, pPipelines);
     lock.lock();
     for (i = 0; i < count; i++) {
-        pipe_state[i]->pipeline = pPipelines[i];
-        dev_data->pipelineMap[pipe_state[i]->pipeline] = pipe_state[i];
+        if (pPipelines[i] == VK_NULL_HANDLE) {
+            delete pipe_state[i];
+        }
+        else {
+            pipe_state[i]->pipeline = pPipelines[i];
+            dev_data->pipelineMap[pipe_state[i]->pipeline] = pipe_state[i];
+        }
     }
 
     return result;