From 8d1ed9e10adab988445bcf528fd995ef3bde6953 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Thu, 16 Feb 2017 11:45:27 -0700 Subject: layers: Fix AllocateDescriptorSets in threading Needed to special case this routine to skip validating objects before creation. Caught in CTS testing. Change-Id: Ic1c1b69bd1d75a5742c8b709624153db6af71885 --- layers/threading.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'layers/threading.cpp') diff --git a/layers/threading.cpp b/layers/threading.cpp index 927aac38..0c46ef03 100644 --- a/layers/threading.cpp +++ b/layers/threading.cpp @@ -360,6 +360,29 @@ VKAPI_ATTR VkResult VKAPI_CALL AllocateCommandBuffers(VkDevice device, const VkC return result; } +VKAPI_ATTR VkResult VKAPI_CALL AllocateDescriptorSets(VkDevice device, const VkDescriptorSetAllocateInfo *pAllocateInfo, + VkDescriptorSet *pDescriptorSets) { + dispatch_key key = get_dispatch_key(device); + layer_data *my_data = GetLayerDataPtr(key, layer_data_map); + VkLayerDispatchTable *pTable = my_data->device_dispatch_table; + VkResult result; + bool threadChecks = startMultiThread(); + if (threadChecks) { + startReadObject(my_data, device); + startWriteObject(my_data, pAllocateInfo->descriptorPool); + // Host access to pAllocateInfo::descriptorPool must be externally synchronized + } + result = pTable->AllocateDescriptorSets(device, pAllocateInfo, pDescriptorSets); + if (threadChecks) { + finishReadObject(my_data, device); + finishWriteObject(my_data, pAllocateInfo->descriptorPool); + // Host access to pAllocateInfo::descriptorPool must be externally synchronized + } else { + finishMultiThread(); + } + return result; +} + VKAPI_ATTR void VKAPI_CALL FreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers) { dispatch_key key = get_dispatch_key(device); -- cgit v1.2.3