From e2313609692ff38ef1af1236fa5c01793248f7a3 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 16 May 2016 11:14:51 +0800 Subject: threading: assert valid instance/device in vkGet*ProcAddr device is always valid in vkGetDeviceProcAddr. instance is valid if pName is not intercepted in layer_intercept_instance_proc. --- layers/threading.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'layers/threading.cpp') diff --git a/layers/threading.cpp b/layers/threading.cpp index 4bdc9644..47d49060 100644 --- a/layers/threading.cpp +++ b/layers/threading.cpp @@ -217,9 +217,8 @@ static inline PFN_vkVoidFunction layer_intercept_instance_proc(const char *name) VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL GetDeviceProcAddr(VkDevice device, const char *funcName) { PFN_vkVoidFunction addr; layer_data *dev_data; - if (device == VK_NULL_HANDLE) { - return NULL; - } + + assert(device); addr = layer_intercept_proc(funcName); if (addr) @@ -242,9 +241,7 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL GetInstanceProcAddr(VkInstance instance return addr; } - if (instance == VK_NULL_HANDLE) { - return NULL; - } + assert(instance); my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map); addr = debug_report_get_instance_proc_addr(my_data->report_data, funcName); -- cgit v1.2.3