From e716d2ed830a7080604a7d6b66224ff88c0f14b6 Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Tue, 17 Nov 2015 15:22:07 -0700 Subject: demos: Change tri to use GetInstanceProcAddr for WSI dev ext entry points This is a better test for loader dynamic dev extension dispatch --- demos/tri.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/demos/tri.c b/demos/tri.c index 91d68218..37433efd 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -1933,20 +1933,22 @@ static void demo_init_vk(struct demo *demo) } } + // Having these GIPA queries of device extension entry points both + // BEFORE and AFTER vkCreateDevice is a good test for the loader + GET_INSTANCE_PROC_ADDR(demo->inst, GetSurfacePropertiesKHR); + GET_INSTANCE_PROC_ADDR(demo->inst, GetSurfaceFormatsKHR); + GET_INSTANCE_PROC_ADDR(demo->inst, GetSurfacePresentModesKHR); err = vkCreateDevice(demo->gpu, &device, NULL, &demo->device); assert(!err); GET_INSTANCE_PROC_ADDR(demo->inst, GetPhysicalDeviceSurfaceSupportKHR); - GET_DEVICE_PROC_ADDR(demo->device, GetSurfacePropertiesKHR); - GET_DEVICE_PROC_ADDR(demo->device, GetSurfaceFormatsKHR); - GET_DEVICE_PROC_ADDR(demo->device, GetSurfacePresentModesKHR); - GET_DEVICE_PROC_ADDR(demo->device, CreateSwapchainKHR); - GET_DEVICE_PROC_ADDR(demo->device, CreateSwapchainKHR); - GET_DEVICE_PROC_ADDR(demo->device, DestroySwapchainKHR); - GET_DEVICE_PROC_ADDR(demo->device, GetSwapchainImagesKHR); - GET_DEVICE_PROC_ADDR(demo->device, AcquireNextImageKHR); - GET_DEVICE_PROC_ADDR(demo->device, QueuePresentKHR); + + GET_INSTANCE_PROC_ADDR(demo->inst, CreateSwapchainKHR); + GET_INSTANCE_PROC_ADDR(demo->inst, DestroySwapchainKHR); + GET_INSTANCE_PROC_ADDR(demo->inst, GetSwapchainImagesKHR); + GET_INSTANCE_PROC_ADDR(demo->inst, AcquireNextImageKHR); + GET_INSTANCE_PROC_ADDR(demo->inst, QueuePresentKHR); vkGetPhysicalDeviceProperties(demo->gpu, &demo->gpu_props); -- cgit v1.2.3