loader: Change to new WSI query functions.

diff --git a/include/vk_layer.h b/include/vk_layer.h
index fc61476..afc103e 100644 (file)
--- a/include/vk_layer.h
+++ b/include/vk_layer.h
@@ -163,10 +163,12 @@ typedef struct VkLayerDispatchTable_
     PFN_vkCmdNextSubpass CmdNextSubpass;
     PFN_vkCmdEndRenderPass CmdEndRenderPass;
     PFN_vkCmdExecuteCommands CmdExecuteCommands;
-    PFN_vkGetSurfaceInfoWSI GetSurfaceInfoWSI;
+    PFN_vkGetSurfacePropertiesWSI GetSurfacePropertiesWSI;
+    PFN_vkGetSurfaceFormatsWSI GetSurfaceFormatsWSI;
+    PFN_vkGetSurfacePresentModesWSI GetSurfacePresentModesWSI;
     PFN_vkCreateSwapChainWSI CreateSwapChainWSI;
     PFN_vkDestroySwapChainWSI DestroySwapChainWSI;
-    PFN_vkGetSwapChainInfoWSI GetSwapChainInfoWSI;
+    PFN_vkGetSwapChainImagesWSI GetSwapChainImagesWSI;
     PFN_vkAcquireNextImageWSI AcquireNextImageWSI;
     PFN_vkQueuePresentWSI QueuePresentWSI;
     PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback;

diff --git a/loader/table_ops.h b/loader/table_ops.h
index c6be289..4003e9c 100644 (file)
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -177,8 +177,10 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table
     table->AcquireNextImageWSI = (PFN_vkAcquireNextImageWSI) gpa(dev, "vkAcquireNextImageWSI");
     table->CreateSwapChainWSI = (PFN_vkCreateSwapChainWSI) gpa(dev, "vkCreateSwapChainWSI");
     table->DestroySwapChainWSI = (PFN_vkDestroySwapChainWSI) gpa(dev, "vkDestroySwapChainWSI");
-    table->GetSurfaceInfoWSI = (PFN_vkGetSurfaceInfoWSI) gpa(dev, "vkGetSurfaceInfoWSI");
-    table->GetSwapChainInfoWSI = (PFN_vkGetSwapChainInfoWSI) gpa(dev, "vkGetSwapChainInfoWSI");
+    table->GetSurfacePropertiesWSI = (PFN_vkGetSurfacePropertiesWSI) gpa(dev, "vkGetSurfacePropertiesWSI");
+    table->GetSurfaceFormatsWSI = (PFN_vkGetSurfaceFormatsWSI) gpa(dev, "vkGetSurfaceFormatsWSI");
+    table->GetSurfacePresentModesWSI = (PFN_vkGetSurfacePresentModesWSI) gpa(dev, "vkGetSurfacePresentModesWSI");
+    table->GetSwapChainImagesWSI = (PFN_vkGetSwapChainImagesWSI) gpa(dev, "vkGetSwapChainImagesWSI");
     table->QueuePresentWSI = (PFN_vkQueuePresentWSI) gpa(dev, "vkQueuePresentWSI");
 }