From a4a2c134fede2aa816965a1a0194c9b570f11b43 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Wed, 10 Jun 2015 17:38:33 -0600 Subject: tri: Use GetProcAddr to get GetDisplayInfoWSI fp --- demos/tri.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/demos/tri.c b/demos/tri.c index 3fae85a5..50680fdc 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -120,6 +120,7 @@ struct demo { VkDisplayPropertiesWSI *display_props; int num_displays; + PFN_vkGetDisplayInfoWSI fpGetDisplayInfoWSI; PFN_vkCreateSwapChainWSI fpCreateSwapChainWSI; PFN_vkDestroySwapChainWSI fpDestroySwapChainWSI; PFN_vkGetSwapChainInfoWSI fpGetSwapChainInfoWSI; @@ -1434,6 +1435,10 @@ static void demo_init_vk(struct demo *demo) "vkCreateInstance Failure"); } + demo->fpGetDisplayInfoWSI = vkGetInstanceProcAddr(demo->inst, "vkGetDisplayInfoWSI"); + if (demo->fpGetDisplayInfoWSI == NULL) + ERR_EXIT("vkGetInstanceProcAddr failed to find vkGetDisplayInfoWSI", + "vkGetInstanceProcAddr Failure"); demo->fpCreateSwapChainWSI = vkGetInstanceProcAddr(demo->inst, "vkCreateSwapChainWSI"); if (demo->fpCreateSwapChainWSI == NULL) ERR_EXIT("vkGetInstanceProcAddr failed to find vkCreateSwapChainWSI", @@ -1512,11 +1517,11 @@ static void demo_init_vk(struct demo *demo) display = demo->display_props[0].display; // Get a VkFormat to use with the VkDisplayWSI we are using: - err = vkGetDisplayInfoWSI(display, VK_DISPLAY_INFO_TYPE_FORMAT_PROPERTIES_WSI, + err = demo->fpGetDisplayInfoWSI(display, VK_DISPLAY_INFO_TYPE_FORMAT_PROPERTIES_WSI, &data_size, NULL); VkDisplayFormatPropertiesWSI* display_format_props = (VkDisplayFormatPropertiesWSI*) malloc(data_size); - err = vkGetDisplayInfoWSI(display, VK_DISPLAY_INFO_TYPE_FORMAT_PROPERTIES_WSI, + err = demo->fpGetDisplayInfoWSI(display, VK_DISPLAY_INFO_TYPE_FORMAT_PROPERTIES_WSI, &data_size, display_format_props); // For now, simply use the first VkFormat (TODO: Enhance this for the // future): -- cgit v1.2.3