From f38be47d7086ed6ad68aae3c42d09763de1a549f Mon Sep 17 00:00:00 2001
From: Mark Mueller <markm@lunarg.com>
Date: Tue, 16 Aug 2016 09:47:31 -0600
Subject: layers: GH424 add check of skip_call results to CreateDevice

skip_call result was ignored allowing for exception violations
under some test conditions.

Change-Id: Ied673a9b932210de52ed189c67221af60415cae9
---
 layers/core_validation.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'layers/core_validation.cpp')

diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 00b66aae..e6c50c32 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -4224,6 +4224,10 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateDevice(VkPhysicalDevice gpu, const VkDevice
     }
     skip_call |= ValidateRequestedQueueFamilyProperties(my_instance_data, pCreateInfo);
 
+    if (skip_call) {
+        return VK_ERROR_VALIDATION_FAILED_EXT;
+    }
+
     VkLayerDeviceCreateInfo *chain_info = get_chain_info(pCreateInfo, VK_LAYER_LINK_INFO);
 
     assert(chain_info->u.pLayerInfo);
-- 
cgit v1.2.3