From 6d72f404df943dd305a2085aea49ad172e56bf57 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Fri, 26 Mar 2021 10:54:49 +0200 Subject: [PATCH] intel/nullhw: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lionel Landwerlin Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4507 Reviewed-by: Tapani Pälli Part-of: --- src/intel/nullhw-layer/intel_nullhw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/intel/nullhw-layer/intel_nullhw.c b/src/intel/nullhw-layer/intel_nullhw.c index 2546f0d492e..329a6fcf505 100644 --- a/src/intel/nullhw-layer/intel_nullhw.c +++ b/src/intel/nullhw-layer/intel_nullhw.c @@ -34,6 +34,7 @@ #include "util/macros.h" #include "util/simple_mtx.h" +#include "vk_dispatch_table.h" #include "vk_enum_to_str.h" #include "vk_util.h" @@ -242,7 +243,7 @@ static VkResult nullhw_CreateDevice( struct instance_data *instance_data = FIND(struct instance_data, physicalDevice); struct device_data *device_data = new_device_data(*pDevice, instance_data); device_data->physical_device = physicalDevice; - vk_load_device_commands(*pDevice, fpGetDeviceProcAddr, &device_data->vtable); + vk_device_dispatch_table_load(&device_data->vtable, fpGetDeviceProcAddr, *pDevice); VkLayerDeviceCreateInfo *load_data_info = get_device_chain_info(pCreateInfo, VK_LOADER_DATA_CALLBACK); @@ -312,9 +313,9 @@ static VkResult nullhw_CreateInstance( if (result != VK_SUCCESS) return result; struct instance_data *instance_data = new_instance_data(*pInstance); - vk_load_instance_commands(instance_data->instance, - fpGetInstanceProcAddr, - &instance_data->vtable); + vk_instance_dispatch_table_load(&instance_data->vtable, + fpGetInstanceProcAddr, + instance_data->instance); return result; }