From: Eduardo Lima Mitev <elima@igalia.com>
Date: Fri, 20 Mar 2020 08:32:03 +0000 (+0100)
Subject: turnip: Instance can be NULL resolving 'GetInstanceProcAddr' entry point
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=55b0a676fdb538095b8d7c6e93a92d702534df39;p=mesa.git

turnip: Instance can be NULL resolving 'GetInstanceProcAddr' entry point

Using turnip driver without a vulkan loader is currently broken because
the entry point resolver is expecting a valid instance when resolving
'vkGetInstanceProcAddr' through vk_icdGetInstanceProcAddr().

Reviewed-by: Jonathan Marek <jonathan@marek.ca>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4257>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4257>
---

diff --git a/src/freedreno/vulkan/tu_entrypoints_gen.py b/src/freedreno/vulkan/tu_entrypoints_gen.py
index facbb69fa78..03c3afc3e7f 100644
--- a/src/freedreno/vulkan/tu_entrypoints_gen.py
+++ b/src/freedreno/vulkan/tu_entrypoints_gen.py
@@ -206,7 +206,7 @@ tu_entrypoint_is_enabled(int index, uint32_t core_version,
    % if not e.device_command:
       if (device) return false;
    % endif
-   % if e.name == 'vkCreateInstance' or e.name == 'vkEnumerateInstanceExtensionProperties' or e.name == 'vkEnumerateInstanceLayerProperties' or e.name == 'vkEnumerateInstanceVersion':
+   % if e.name == 'vkGetInstanceProcAddr' or e.name == 'vkCreateInstance' or e.name == 'vkEnumerateInstanceExtensionProperties' or e.name == 'vkEnumerateInstanceLayerProperties' or e.name == 'vkEnumerateInstanceVersion':
       return !device;
    % elif e.core_version:
       return instance && ${e.core_version.c_vk_version()} <= core_version;