aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Ashburn <jon@lunarg.com>2015-11-17 15:22:07 -0700
committerJon Ashburn <jon@lunarg.com>2015-11-18 17:05:38 -0700
commite716d2ed830a7080604a7d6b66224ff88c0f14b6 (patch)
tree10ffa41190b94794181e037b050f37daa0295c89
parent9f8edebd0fdc873012ac1fee47265362abcf4f51 (diff)
downloadusermoji-e716d2ed830a7080604a7d6b66224ff88c0f14b6.tar.xz
demos: Change tri to use GetInstanceProcAddr for WSI dev ext entry points
This is a better test for loader dynamic dev extension dispatch
-rw-r--r--demos/tri.c20
1 files 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);