summaryrefslogtreecommitdiff
path: root/vulkan/libvulkan/driver.cpp
diff options
context:
space:
mode:
author Chia-I Wu <olv@google.com> 2016-04-22 06:40:40 +0800
committer Chia-I Wu <olv@google.com> 2016-04-22 06:44:28 +0800
commit109f8985ceaf746fd04b6fe81be238b3865062b7 (patch)
tree2d88eb6c6f9a731a9c9e5abbbbc1c879f84e9da6 /vulkan/libvulkan/driver.cpp
parentdcad39536dda5fc88aa3ae588f535fb3edee8c62 (diff)
vulkan: silence a warning when layers are enabled
Layers always do vkGetInstanceProcAddr(VK_NULL_HANDLE, "vkCreateDevice") and we should not log an error. Change-Id: Ifeba21da73d982775edc4e6a91ce0f0f5eab191d
Diffstat (limited to 'vulkan/libvulkan/driver.cpp')
-rw-r--r--vulkan/libvulkan/driver.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index 17ccc72eb3..b02f5b4324 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -480,17 +480,20 @@ PFN_vkVoidFunction GetInstanceProcAddr(VkInstance instance, const char* pName) {
if (hook->type == ProcHook::GLOBAL)
return hook->proc;
+ // v0 layers expect
+ //
+ // vkGetInstanceProcAddr(VK_NULL_HANDLE, "vkCreateDevice");
+ //
+ // to work.
+ if (strcmp(pName, "vkCreateDevice") == 0)
+ return hook->proc;
+
ALOGE(
"Invalid use of vkGetInstanceProcAddr to query %s without an "
"instance",
pName);
- // Some naughty layers expect
- //
- // vkGetInstanceProcAddr(VK_NULL_HANDLE, "vkCreateDevice");
- //
- // to work.
- return (strcmp(pName, "vkCreateDevice") == 0) ? hook->proc : nullptr;
+ return nullptr;
}
PFN_vkVoidFunction proc;