diff options
| author | Michael Lentine <mlentine@google.com> | 2016-01-28 14:20:46 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-02-03 15:51:51 -0700 |
| commit | 52ef57d311940634489550540a7c19bf7c952958 (patch) | |
| tree | 8fe16230f83d2b4864aec879fb9cebddfdb268b2 /layers/device_limits.cpp | |
| parent | 62da1b807d86e45449c7aaf714de3d939f8bee09 (diff) | |
| download | usermoji-52ef57d311940634489550540a7c19bf7c952958.tar.xz | |
layers: Add check to make sure inherited queries in enabled before use.
Diffstat (limited to 'layers/device_limits.cpp')
| -rw-r--r-- | layers/device_limits.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp index 699abf4d..54d01769 100644 --- a/layers/device_limits.cpp +++ b/layers/device_limits.cpp @@ -540,6 +540,20 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkFreeCommandBuffers(VkDevice device, get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->FreeCommandBuffers(device, commandPool, count, pCommandBuffers); } +VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkBeginCommandBuffer(VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo* pBeginInfo) +{ + bool skipCall = false; + layer_data *dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + const VkCommandBufferInheritanceInfo *pInfo = pBeginInfo->pInheritanceInfo; + if (dev_data->actualPhysicalDeviceFeatures.inheritedQueries == VK_FALSE && pInfo && pInfo->occlusionQueryEnable != VK_FALSE) { + skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, reinterpret_cast<uint64_t>(commandBuffer), __LINE__, + DEVLIMITS_INVALID_INHERITED_QUERY, "DL", + "Cannot set inherited occlusionQueryEnable in vkBeginCommandBuffer() when device does not support inheritedQueries."); + } + if (!skipCall) + dev_data->device_dispatch_table->BeginCommandBuffer(commandBuffer, pBeginInfo); +} + VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue) { VkBool32 skipCall = VK_FALSE; @@ -739,6 +753,8 @@ VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetDeviceProcAddr(VkD return (PFN_vkVoidFunction) vkAllocateCommandBuffers; if (!strcmp(funcName, "vkFreeCommandBuffers")) return (PFN_vkVoidFunction) vkFreeCommandBuffers; + if (!strcmp(funcName, "vkBeginCommandBuffer")) + return (PFN_vkVoidFunction) vkBeginCommandBuffer; if (!strcmp(funcName, "vkCmdUpdateBuffer")) return (PFN_vkVoidFunction) vkCmdUpdateBuffer; if (!strcmp(funcName, "vkBindBufferMemory")) |