From 0c399dca51d2aa1a784edcb6e409aba5b67e1473 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 16 Jan 2018 18:11:03 -0800 Subject: [PATCH] anv: Add a per-instance dispatch table MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We also switch GetInstanceProcAddr over to use it. Reviewed-by: Samuel Iglesias Gonsálvez --- src/intel/vulkan/anv_device.c | 7 ++++++- src/intel/vulkan/anv_private.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index c3a8fbbb4e6..d827aec9a71 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -574,6 +574,7 @@ VkResult anv_CreateInstance( instance->apiVersion = client_version; instance->enabled_extensions = enabled_extensions; + instance->dispatch = anv_dispatch_table; instance->physicalDeviceCount = -1; result = vk_debug_report_instance_init(&instance->debug_report_callbacks); @@ -1088,7 +1089,11 @@ PFN_vkVoidFunction anv_GetInstanceProcAddr( if (instance == NULL) return NULL; - return anv_lookup_entrypoint(NULL, pName); + int idx = anv_get_entrypoint_index(pName); + if (idx < 0) + return NULL; + + return instance->dispatch.entrypoints[idx]; } /* With version 1+ of the loader interface the ICD should expose diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 1fd7c39567d..d1b2ebc11fb 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -797,6 +797,7 @@ struct anv_instance { uint32_t apiVersion; struct anv_instance_extension_table enabled_extensions; + struct anv_dispatch_table dispatch; int physicalDeviceCount; struct anv_physical_device physicalDevice; -- 2.30.2