diff options
| author | Chia-I Wu <olv@google.com> | 2016-04-28 14:21:13 +0800 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-05-05 06:42:19 -0600 |
| commit | b70bedd6ecb8be7ff9ef8100869e74531f10f477 (patch) | |
| tree | ca1d4320556802a24692b96d3cf615ee15f424ad | |
| parent | 9ca49b0a0388b10f9179015dde8829c020dbc5db (diff) | |
| download | usermoji-b70bedd6ecb8be7ff9ef8100869e74531f10f477.tar.xz | |
device_limits: improve EnumerateDeviceExtensionProperties
Call down the next layer unless pLayerName is device_limits.
| -rw-r--r-- | layers/device_limits.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp index 90c70349..ba721272 100644 --- a/layers/device_limits.cpp +++ b/layers/device_limits.cpp @@ -670,13 +670,14 @@ VKAPI_ATTR VkResult VKAPI_CALL EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pCount, VkExtensionProperties *pProperties) { - if (pLayerName == NULL) { - dispatch_key key = get_dispatch_key(physicalDevice); - layer_data *my_data = get_my_data_ptr(key, layer_data_map); - return my_data->instance_dispatch_table->EnumerateDeviceExtensionProperties(physicalDevice, NULL, pCount, pProperties); - } else { + if (pLayerName && !strcmp(pLayerName, global_layer.layerName)) return util_GetExtensionProperties(0, nullptr, pCount, pProperties); - } + + assert(physicalDevice); + + dispatch_key key = get_dispatch_key(physicalDevice); + layer_data *my_data = get_my_data_ptr(key, layer_data_map); + return my_data->instance_dispatch_table->EnumerateDeviceExtensionProperties(physicalDevice, pLayerName, pCount, pProperties); } VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL @@ -820,7 +821,8 @@ vkEnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pCount, VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pCount, VkExtensionProperties *pProperties) { - return device_limits::EnumerateDeviceExtensionProperties(physicalDevice, pLayerName, pCount, pProperties); + // the layer command handles VK_NULL_HANDLE just fine + return device_limits::EnumerateDeviceExtensionProperties(VK_NULL_HANDLE, pLayerName, pCount, pProperties); } VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetDeviceProcAddr(VkDevice dev, const char *funcName) { |