From 7d8342c6d9550e2d4d9b47dbb446872611ea1153 Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Thu, 8 Oct 2015 15:58:23 -0600 Subject: demos: Add getting GetDeviceProcAddr entrypoint from GetInstanceProcAddr Better test for the loader. --- demos/cube.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/demos/cube.c b/demos/cube.c index 6437a71e..6b83080b 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -84,9 +84,13 @@ } \ } +static PFN_vkGetDeviceProcAddr g_gdpa = NULL; + #define GET_DEVICE_PROC_ADDR(dev, entrypoint) \ { \ - demo->fp##entrypoint = (PFN_vk##entrypoint) vkGetDeviceProcAddr(dev, "vk"#entrypoint); \ + if(!g_gdpa) \ + g_gdpa = (PFN_vkGetDeviceProcAddr) vkGetInstanceProcAddr(demo->inst, "vkGetDeviceProcAddr"); \ + demo->fp##entrypoint = (PFN_vk##entrypoint) g_gdpa(dev, "vk"#entrypoint); \ if (demo->fp##entrypoint == NULL) { \ ERR_EXIT("vkGetDeviceProcAddr failed to find vk"#entrypoint, \ "vkGetDeviceProcAddr Failure"); \ -- cgit v1.2.3