lvp: avoid accessing member of NULL ptr for global entries

Cc: mesa-stable
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22979>
(cherry picked from commit aa57e8ef18)
This commit is contained in:
Yiwei Zhang 2023-05-12 00:47:54 -07:00 committed by Eric Engestrom
parent 24e1a5ebaf
commit 8604d58877
2 changed files with 3 additions and 3 deletions

View file

@ -3874,7 +3874,7 @@
"description": "lvp: avoid accessing member of NULL ptr for global entries",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

View file

@ -1472,8 +1472,8 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL lvp_GetInstanceProcAddr(
VkInstance _instance,
const char* pName)
{
LVP_FROM_HANDLE(lvp_instance, instance, _instance);
return vk_instance_get_proc_addr(&instance->vk,
VK_FROM_HANDLE(vk_instance, instance, _instance);
return vk_instance_get_proc_addr(instance,
&lvp_instance_entrypoints,
pName);
}