WSI: Convert WSI swapchain extension usage to new KHR style
diff --git a/loader/loader.c b/loader/loader.c
index 87e854d..0ab7ca3 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -100,7 +100,7 @@
.GetPhysicalDeviceExtensionProperties = loader_GetPhysicalDeviceExtensionProperties,
.GetPhysicalDeviceLayerProperties = loader_GetPhysicalDeviceLayerProperties,
.GetPhysicalDeviceSparseImageFormatProperties = loader_GetPhysicalDeviceSparseImageFormatProperties,
- .GetPhysicalDeviceSurfaceSupportWSI = loader_GetPhysicalDeviceSurfaceSupportWSI,
+ .GetPhysicalDeviceSurfaceSupportKHR = loader_GetPhysicalDeviceSurfaceSupportKHR,
.DbgCreateMsgCallback = loader_DbgCreateMsgCallback,
.DbgDestroyMsgCallback = loader_DbgDestroyMsgCallback,
};
@@ -1036,7 +1036,7 @@
LOOKUP_GIPA(GetPhysicalDeviceSparseImageFormatProperties, true);
LOOKUP_GIPA(DbgCreateMsgCallback, false);
LOOKUP_GIPA(DbgDestroyMsgCallback, false);
- LOOKUP_GIPA(GetPhysicalDeviceSurfaceSupportWSI, false);
+ LOOKUP_GIPA(GetPhysicalDeviceSurfaceSupportKHR, false);
#undef LOOKUP_GIPA
diff --git a/loader/loader.h b/loader/loader.h
index 1e4a3ab..98c5756 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -30,7 +30,7 @@
#include <vulkan.h>
#include <vk_debug_report_lunarg.h>
-#include <vk_wsi_swapchain.h>
+#include <vk_ext_khr_swapchain.h>
#include <vk_layer.h>
#include <vk_icd.h>
#include <assert.h>
@@ -144,7 +144,7 @@
PFN_vkGetPhysicalDeviceSparseImageFormatProperties GetPhysicalDeviceSparseImageFormatProperties;
PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback;
PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback;
- PFN_vkGetPhysicalDeviceSurfaceSupportWSI GetPhysicalDeviceSurfaceSupportWSI;
+ PFN_vkGetPhysicalDeviceSurfaceSupportKHR GetPhysicalDeviceSurfaceSupportKHR;
/*
* Fill in the cache of available device extensions from
diff --git a/loader/table_ops.h b/loader/table_ops.h
index 4064178..75c7b7a 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -178,14 +178,14 @@
//TODO move into it's own table
//TODO also consider dropping trampoline code for these device level extensions entirely
// then don't need loader to know about these at all but then not queryable via GIPA
- table->AcquireNextImageWSI = (PFN_vkAcquireNextImageWSI) gpa(dev, "vkAcquireNextImageWSI");
- table->CreateSwapChainWSI = (PFN_vkCreateSwapChainWSI) gpa(dev, "vkCreateSwapChainWSI");
- table->DestroySwapChainWSI = (PFN_vkDestroySwapChainWSI) gpa(dev, "vkDestroySwapChainWSI");
- 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");
+ table->AcquireNextImageKHR = (PFN_vkAcquireNextImageKHR) gpa(dev, "vkAcquireNextImageKHR");
+ table->CreateSwapchainKHR = (PFN_vkCreateSwapchainKHR) gpa(dev, "vkCreateSwapchainKHR");
+ table->DestroySwapchainKHR = (PFN_vkDestroySwapchainKHR) gpa(dev, "vkDestroySwapchainKHR");
+ table->GetSurfacePropertiesKHR = (PFN_vkGetSurfacePropertiesKHR) gpa(dev, "vkGetSurfacePropertiesKHR");
+ table->GetSurfaceFormatsKHR = (PFN_vkGetSurfaceFormatsKHR) gpa(dev, "vkGetSurfaceFormatsKHR");
+ table->GetSurfacePresentModesKHR = (PFN_vkGetSurfacePresentModesKHR) gpa(dev, "vkGetSurfacePresentModesKHR");
+ table->GetSwapchainImagesKHR = (PFN_vkGetSwapchainImagesKHR) gpa(dev, "vkGetSwapchainImagesKHR");
+ table->QueuePresentKHR = (PFN_vkQueuePresentKHR) gpa(dev, "vkQueuePresentKHR");
}
static inline void *loader_lookup_device_dispatch_table(
@@ -547,8 +547,8 @@
return (void *) table->GetPhysicalDeviceExtensionProperties;
if (!strcmp(name, "GetPhysicalDeviceLayerProperties"))
return (void *) table->GetPhysicalDeviceLayerProperties;
- if (!strcmp(name, "GetPhysicalDeviceSurfaceSupportWSI"))
- return (void *) table->GetPhysicalDeviceSurfaceSupportWSI;
+ if (!strcmp(name, "GetPhysicalDeviceSurfaceSupportKHR"))
+ return (void *) table->GetPhysicalDeviceSurfaceSupportKHR;
if (!strcmp(name, "DbgCreateMsgCallback"))
return (void *) table->DbgCreateMsgCallback;
if (!strcmp(name, "DbgDestroyMsgCallback"))
diff --git a/loader/vk-loader-generate.py b/loader/vk-loader-generate.py
index eed42df..b51c6e4 100755
--- a/loader/vk-loader-generate.py
+++ b/loader/vk-loader-generate.py
@@ -48,7 +48,7 @@
def _requires_special_trampoline_code(self, name):
# Dont be cute trying to use a general rule to programmatically populate this list
# it just obsfucates what is going on!
- wsi_creates_dispatchable_object = ["CreateSwapChainWSI"]
+ wsi_creates_dispatchable_object = ["CreateSwapchainKHR"]
creates_dispatchable_object = ["CreateDevice", "GetDeviceQueue", "CreateCommandBuffer"] + wsi_creates_dispatchable_object
if name in creates_dispatchable_object:
return True
@@ -136,13 +136,13 @@
if "Get" in proto.name:
method = "loader_set_dispatch"
- if proto.name == "GetSwapChainInfoWSI":
+ if proto.name == "GetSwapchainInfoKHR":
ptype = proto.params[-3].name
psize = proto.params[-2].name
pdata = proto.params[-1].name
- cond = ("%s == VK_SWAP_CHAIN_INFO_TYPE_PERSISTENT_IMAGES_WSI && "
+ cond = ("%s == VK_SWAP_CHAIN_INFO_TYPE_PERSISTENT_IMAGES_KHR && "
"%s && %s" % (ptype, pdata, cond))
- setup.append("VkSwapChainImageInfoWSI *info = %s;" % pdata)
+ setup.append("VkSwapchainImageInfoKHR *info = %s;" % pdata)
setup.append("size_t count = *%s / sizeof(*info), i;" % psize)
setup.append("for (i = 0; i < count; i++) {")
setup.append(" %s(info[i].image, disp);" % method)
@@ -342,7 +342,7 @@
for proto in self.protos:
if self.exports and proto.name not in self.exports:
continue
- if proto.name.endswith("WSI"):
+ if proto.name.endswith("KHR"):
continue
body.append(" vk" + proto.name)
diff --git a/loader/wsi_swapchain.c b/loader/wsi_swapchain.c
index 4860d84..683945e 100644
--- a/loader/wsi_swapchain.c
+++ b/loader/wsi_swapchain.c
@@ -35,8 +35,8 @@
#include "wsi_swapchain.h"
static const VkExtensionProperties wsi_swapchain_extension_info = {
- .extName = VK_WSI_SWAPCHAIN_EXTENSION_NAME,
- .specVersion = VK_WSI_SWAPCHAIN_REVISION,
+ .extName = VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME,
+ .specVersion = VK_EXT_KHR_SWAPCHAIN_VERSION,
};
void wsi_swapchain_add_instance_extensions(
@@ -52,7 +52,7 @@
ptr_instance->wsi_swapchain_enabled = false;
for (uint32_t i = 0; i < pCreateInfo->extensionCount; i++) {
- if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_WSI_SWAPCHAIN_EXTENSION_NAME) == 0) {
+ if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME) == 0) {
ptr_instance->wsi_swapchain_enabled = true;
return;
}
@@ -61,19 +61,19 @@
/*
* This is the trampoline entrypoint
- * for GetPhysicalDeviceSurfaceSupportWSI
+ * for GetPhysicalDeviceSurfaceSupportKHR
*/
-VkResult wsi_swapchain_GetPhysicalDeviceSurfaceSupportWSI(
+VkResult wsi_swapchain_GetPhysicalDeviceSurfaceSupportKHR(
VkPhysicalDevice physicalDevice,
uint32_t queueNodeIndex,
- const VkSurfaceDescriptionWSI* pSurfaceDescription,
+ const VkSurfaceDescriptionKHR* pSurfaceDescription,
VkBool32* pSupported)
{
const VkLayerInstanceDispatchTable *disp;
// TBD/TODO: DO WE NEED TO DO LOCKING FOR THIS FUNCTION?
disp = loader_get_instance_dispatch(physicalDevice);
loader_platform_thread_lock_mutex(&loader_lock);
- VkResult res = disp->GetPhysicalDeviceSurfaceSupportWSI(
+ VkResult res = disp->GetPhysicalDeviceSurfaceSupportKHR(
physicalDevice,
queueNodeIndex,
pSurfaceDescription,
@@ -84,12 +84,12 @@
/*
* This is the instance chain terminator function
- * for GetPhysicalDeviceSurfaceSupportWSI
+ * for GetPhysicalDeviceSurfaceSupportKHR
*/
-VkResult VKAPI loader_GetPhysicalDeviceSurfaceSupportWSI(
+VkResult VKAPI loader_GetPhysicalDeviceSurfaceSupportKHR(
VkPhysicalDevice physicalDevice,
uint32_t queueNodeIndex,
- const VkSurfaceDescriptionWSI* pSurfaceDescription,
+ const VkSurfaceDescriptionKHR* pSurfaceDescription,
VkBool32* pSupported)
{
uint32_t gpu_index;
@@ -97,8 +97,8 @@
VkResult res = VK_ERROR_UNAVAILABLE;
*pSupported = false;
- if (icd->GetPhysicalDeviceSurfaceSupportWSI) {
- res = icd->GetPhysicalDeviceSurfaceSupportWSI(physicalDevice,
+ if (icd->GetPhysicalDeviceSurfaceSupportKHR) {
+ res = icd->GetPhysicalDeviceSurfaceSupportKHR(physicalDevice,
queueNodeIndex,
pSurfaceDescription,
pSupported);
@@ -116,8 +116,8 @@
return NULL;
}
- if (!strcmp(pName, "vkGetPhysicalDeviceSurfaceSupportWSI")) {
- return (void*) wsi_swapchain_GetPhysicalDeviceSurfaceSupportWSI;
+ if (!strcmp(pName, "vkGetPhysicalDeviceSurfaceSupportKHR")) {
+ return (void*) wsi_swapchain_GetPhysicalDeviceSurfaceSupportKHR;
}
return NULL;
diff --git a/loader/wsi_swapchain.h b/loader/wsi_swapchain.h
index 68dbc96..c0904e9 100644
--- a/loader/wsi_swapchain.h
+++ b/loader/wsi_swapchain.h
@@ -29,7 +29,7 @@
#include "vk_loader_platform.h"
#include "loader.h"
-#include "vk_wsi_swapchain.h"
+#include "vk_ext_khr_swapchain.h"
void wsi_swapchain_add_instance_extensions(
struct loader_extension_list *ext_list);
@@ -42,8 +42,8 @@
struct loader_instance *ptr_instance,
const char* pName);
-VkResult VKAPI loader_GetPhysicalDeviceSurfaceSupportWSI(
+VkResult VKAPI loader_GetPhysicalDeviceSurfaceSupportKHR(
VkPhysicalDevice physicalDevice,
uint32_t queueNodeIndex,
- const VkSurfaceDescriptionWSI* pSurfaceDescription,
+ const VkSurfaceDescriptionKHR* pSurfaceDescription,
VkBool32* pSupported);