WSI: sed-generated changes to WSI code (not all that's needed).
Conflicts:
demos/cube.c
demos/tri.c
demos/vulkaninfo.c
icd/common/icd.h
loader/loader.h
diff --git a/layers/apidump.h b/layers/apidump.h
index e5f4ff8..0cf6f3b 100644
--- a/layers/apidump.h
+++ b/layers/apidump.h
@@ -68,9 +68,9 @@
uint32_t i;
VkLayerDispatchTable *pDisp = device_dispatch_table(device);
PFN_vkGetDeviceProcAddr gpa = pDisp->GetDeviceProcAddr;
- pDisp->GetSurfacePropertiesKHR = (PFN_vkGetSurfacePropertiesKHR) gpa(device, "vkGetSurfacePropertiesKHR");
- pDisp->GetSurfaceFormatsKHR = (PFN_vkGetSurfaceFormatsKHR) gpa(device, "vkGetSurfaceFormatsKHR");
- pDisp->GetSurfacePresentModesKHR = (PFN_vkGetSurfacePresentModesKHR) gpa(device, "vkGetSurfacePresentModesKHR");
+ pDisp->GetPhysicalDeviceSurfaceCapabilitiesKHR = (PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR) gpa(device, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR");
+ pDisp->GetPhysicalDeviceSurfaceFormatsKHR = (PFN_vkGetPhysicalDeviceSurfaceFormatsKHR) gpa(device, "vkGetPhysicalDeviceSurfaceFormatsKHR");
+ pDisp->GetPhysicalDeviceSurfacePresentModesKHR = (PFN_vkGetPhysicalDeviceSurfacePresentModesKHR) gpa(device, "vkGetPhysicalDeviceSurfacePresentModesKHR");
pDisp->CreateSwapchainKHR = (PFN_vkCreateSwapchainKHR) gpa(device, "vkCreateSwapchainKHR");
pDisp->DestroySwapchainKHR = (PFN_vkDestroySwapchainKHR) gpa(device, "vkDestroySwapchainKHR");
pDisp->GetSwapchainImagesKHR = (PFN_vkGetSwapchainImagesKHR) gpa(device, "vkGetSwapchainImagesKHR");
@@ -79,7 +79,7 @@
deviceExtMap[pDisp].wsi_enabled = false;
for (i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) {
- if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME) == 0)
+ if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SWAPCHAIN_EXTENSION_NAME) == 0)
deviceExtMap[pDisp].wsi_enabled = true;
}
@@ -93,7 +93,7 @@
pDisp->GetPhysicalDeviceSurfaceSupportKHR = (PFN_vkGetPhysicalDeviceSurfaceSupportKHR) gpa(instance, "vkGetPhysicalDeviceSurfaceSupportKHR");
instanceExtMap[pDisp].wsi_enabled = false;
for (i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) {
- if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME) == 0)
+ if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SURFACE_EXTENSION_NAME) == 0)
instanceExtMap[pDisp].wsi_enabled = true;
}
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 31640bf..e6bc5aa 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1081,9 +1081,9 @@
layer_data *my_device_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map);
VkLayerDispatchTable *pDisp = my_device_data->device_dispatch_table;
PFN_vkGetDeviceProcAddr gpa = pDisp->GetDeviceProcAddr;
- pDisp->GetSurfacePropertiesKHR = (PFN_vkGetSurfacePropertiesKHR) gpa(device, "vkGetSurfacePropertiesKHR");
- pDisp->GetSurfaceFormatsKHR = (PFN_vkGetSurfaceFormatsKHR) gpa(device, "vkGetSurfaceFormatsKHR");
- pDisp->GetSurfacePresentModesKHR = (PFN_vkGetSurfacePresentModesKHR) gpa(device, "vkGetSurfacePresentModesKHR");
+ pDisp->GetPhysicalDeviceSurfaceCapabilitiesKHR = (PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR) gpa(device, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR");
+ pDisp->GetPhysicalDeviceSurfaceFormatsKHR = (PFN_vkGetPhysicalDeviceSurfaceFormatsKHR) gpa(device, "vkGetPhysicalDeviceSurfaceFormatsKHR");
+ pDisp->GetPhysicalDeviceSurfacePresentModesKHR = (PFN_vkGetPhysicalDeviceSurfacePresentModesKHR) gpa(device, "vkGetPhysicalDeviceSurfacePresentModesKHR");
pDisp->CreateSwapchainKHR = (PFN_vkCreateSwapchainKHR) gpa(device, "vkCreateSwapchainKHR");
pDisp->DestroySwapchainKHR = (PFN_vkDestroySwapchainKHR) gpa(device, "vkDestroySwapchainKHR");
pDisp->GetSwapchainImagesKHR = (PFN_vkGetSwapchainImagesKHR) gpa(device, "vkGetSwapchainImagesKHR");
@@ -1091,7 +1091,7 @@
pDisp->QueuePresentKHR = (PFN_vkQueuePresentKHR) gpa(device, "vkQueuePresentKHR");
my_device_data->wsi_enabled = VK_FALSE;
for (uint32_t i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) {
- if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME) == 0)
+ if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SWAPCHAIN_EXTENSION_NAME) == 0)
my_device_data->wsi_enabled = true;
}
}
diff --git a/layers/object_track.h b/layers/object_track.h
index f9991ba..0b80fce 100644
--- a/layers/object_track.h
+++ b/layers/object_track.h
@@ -190,9 +190,9 @@
layer_data *my_device_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map);
VkLayerDispatchTable *pDisp = get_dispatch_table(ObjectTracker_device_table_map, device);
PFN_vkGetDeviceProcAddr gpa = pDisp->GetDeviceProcAddr;
- pDisp->GetSurfacePropertiesKHR = (PFN_vkGetSurfacePropertiesKHR) gpa(device, "vkGetSurfacePropertiesKHR");
- pDisp->GetSurfaceFormatsKHR = (PFN_vkGetSurfaceFormatsKHR) gpa(device, "vkGetSurfaceFormatsKHR");
- pDisp->GetSurfacePresentModesKHR = (PFN_vkGetSurfacePresentModesKHR) gpa(device, "vkGetSurfacePresentModesKHR");
+ pDisp->GetPhysicalDeviceSurfaceCapabilitiesKHR = (PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR) gpa(device, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR");
+ pDisp->GetPhysicalDeviceSurfaceFormatsKHR = (PFN_vkGetPhysicalDeviceSurfaceFormatsKHR) gpa(device, "vkGetPhysicalDeviceSurfaceFormatsKHR");
+ pDisp->GetPhysicalDeviceSurfacePresentModesKHR = (PFN_vkGetPhysicalDeviceSurfacePresentModesKHR) gpa(device, "vkGetPhysicalDeviceSurfacePresentModesKHR");
pDisp->CreateSwapchainKHR = (PFN_vkCreateSwapchainKHR) gpa(device, "vkCreateSwapchainKHR");
pDisp->DestroySwapchainKHR = (PFN_vkDestroySwapchainKHR) gpa(device, "vkDestroySwapchainKHR");
pDisp->GetSwapchainImagesKHR = (PFN_vkGetSwapchainImagesKHR) gpa(device, "vkGetSwapchainImagesKHR");
@@ -200,7 +200,7 @@
pDisp->QueuePresentKHR = (PFN_vkQueuePresentKHR) gpa(device, "vkQueuePresentKHR");
my_device_data->wsi_enabled = false;
for (uint32_t i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) {
- if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME) == 0)
+ if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SWAPCHAIN_EXTENSION_NAME) == 0)
my_device_data->wsi_enabled = true;
if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], "OBJTRACK_EXTENSIONS") == 0)
@@ -216,7 +216,7 @@
pDisp->GetPhysicalDeviceSurfaceSupportKHR = (PFN_vkGetPhysicalDeviceSurfaceSupportKHR) gpa(instance, "vkGetPhysicalDeviceSurfaceSupportKHR");
instanceExtMap[pDisp].wsi_enabled = false;
for (i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) {
- if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME) == 0)
+ if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SURFACE_EXTENSION_NAME) == 0)
instanceExtMap[pDisp].wsi_enabled = true;
}
@@ -270,8 +270,8 @@
{
uint32_t index = objType;
if (objType > VK_OBJECT_TYPE_END_RANGE) {
- // These come from vk_ext_khr_swapchain.h, rebase
- index = (index -(VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NUMBER * -1000)) + VK_OBJECT_TYPE_END_RANGE;
+ // These come from VK_KHR_surface.h, rebase
+ index = (index -(VK_KHR_SWAPCHAIN_EXTENSION_NUMBER * -1000)) + VK_OBJECT_TYPE_END_RANGE;
}
return index;
}
diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp
index 2c31b83..8a62f79 100644
--- a/layers/swapchain.cpp
+++ b/layers/swapchain.cpp
@@ -46,9 +46,9 @@
layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map);
VkLayerDispatchTable *pDisp = my_data->device_dispatch_table;
PFN_vkGetDeviceProcAddr gpa = pDisp->GetDeviceProcAddr;
- pDisp->GetSurfacePropertiesKHR = (PFN_vkGetSurfacePropertiesKHR) gpa(device, "vkGetSurfacePropertiesKHR");
- pDisp->GetSurfaceFormatsKHR = (PFN_vkGetSurfaceFormatsKHR) gpa(device, "vkGetSurfaceFormatsKHR");
- pDisp->GetSurfacePresentModesKHR = (PFN_vkGetSurfacePresentModesKHR) gpa(device, "vkGetSurfacePresentModesKHR");
+ pDisp->GetPhysicalDeviceSurfaceCapabilitiesKHR = (PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR) gpa(device, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR");
+ pDisp->GetPhysicalDeviceSurfaceFormatsKHR = (PFN_vkGetPhysicalDeviceSurfaceFormatsKHR) gpa(device, "vkGetPhysicalDeviceSurfaceFormatsKHR");
+ pDisp->GetPhysicalDeviceSurfacePresentModesKHR = (PFN_vkGetPhysicalDeviceSurfacePresentModesKHR) gpa(device, "vkGetPhysicalDeviceSurfacePresentModesKHR");
pDisp->CreateSwapchainKHR = (PFN_vkCreateSwapchainKHR) gpa(device, "vkCreateSwapchainKHR");
pDisp->DestroySwapchainKHR = (PFN_vkDestroySwapchainKHR) gpa(device, "vkDestroySwapchainKHR");
pDisp->GetSwapchainImagesKHR = (PFN_vkGetSwapchainImagesKHR) gpa(device, "vkGetSwapchainImagesKHR");
@@ -77,7 +77,7 @@
// No need to check if the extension was advertised by
// vkEnumerateDeviceExtensionProperties(), since the loader handles that.
for (i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) {
- if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME) == 0) {
+ if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SWAPCHAIN_EXTENSION_NAME) == 0) {
my_data->deviceMap[device].deviceSwapchainExtensionEnabled = true;
}
@@ -92,7 +92,7 @@
PFN_vkGetInstanceProcAddr gpa = pDisp->GetInstanceProcAddr;
pDisp->GetPhysicalDeviceSurfaceSupportKHR = (PFN_vkGetPhysicalDeviceSurfaceSupportKHR) gpa(instance, "vkGetPhysicalDeviceSurfaceSupportKHR");
- // Remember this instance, and whether the VK_EXT_KHR_swapchain extension
+ // Remember this instance, and whether the VK_KHR_surface extension
// was enabled for it:
my_data->instanceMap[instance].instance = instance;
my_data->instanceMap[instance].swapchainExtensionEnabled = false;
@@ -101,7 +101,7 @@
// VkInstance. No need to check if the extension was advertised by
// vkEnumerateInstanceExtensionProperties(), since the loader handles that.
for (i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) {
- if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME) == 0) {
+ if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SURFACE_EXTENSION_NAME) == 0) {
my_data->instanceMap[instance].swapchainExtensionEnabled = true;
}
@@ -396,7 +396,7 @@
"VkInstance",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
"%s() called even though the %s extension was not enabled for this VkInstance.",
- __FUNCTION__, VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME);
+ __FUNCTION__, VK_KHR_SURFACE_EXTENSION_NAME);
}
if (VK_FALSE == skipCall) {
@@ -419,7 +419,7 @@
return VK_ERROR_VALIDATION_FAILED;
}
-VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetSurfacePropertiesKHR(VkDevice device, const VkSurfaceDescriptionKHR* pSurfaceDescription, VkSurfacePropertiesKHR* pSurfaceProperties)
+VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkDevice device, const VkSurfaceDescriptionKHR* pSurfaceDescription, VkSurfaceCapabilitiesKHR* pSurfaceProperties)
{
VkResult result = VK_SUCCESS;
VkBool32 skipCall = VK_FALSE;
@@ -436,12 +436,12 @@
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
"%s() called even though the %s extension was not enabled for this VkDevice.",
- __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
+ __FUNCTION__, VK_KHR_SWAPCHAIN_EXTENSION_NAME);
}
if (VK_FALSE == skipCall) {
// Call down the call chain:
- result = my_data->device_dispatch_table->GetSurfacePropertiesKHR(
+ result = my_data->device_dispatch_table->GetPhysicalDeviceSurfaceCapabilitiesKHR(
device, pSurfaceDescription, pSurfaceProperties);
if ((result == VK_SUCCESS) && pDevice) {
@@ -454,7 +454,7 @@
return VK_ERROR_VALIDATION_FAILED;
}
-VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetSurfaceFormatsKHR(VkDevice device, const VkSurfaceDescriptionKHR* pSurfaceDescription, uint32_t* pCount, VkSurfaceFormatKHR* pSurfaceFormats)
+VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormatsKHR(VkDevice device, const VkSurfaceDescriptionKHR* pSurfaceDescription, uint32_t* pCount, VkSurfaceFormatKHR* pSurfaceFormats)
{
VkResult result = VK_SUCCESS;
VkBool32 skipCall = VK_FALSE;
@@ -471,12 +471,12 @@
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
"%s() called even though the %s extension was not enabled for this VkDevice.",
- __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
+ __FUNCTION__, VK_KHR_SWAPCHAIN_EXTENSION_NAME);
}
if (VK_FALSE == skipCall) {
// Call down the call chain:
- result = my_data->device_dispatch_table->GetSurfaceFormatsKHR(
+ result = my_data->device_dispatch_table->GetPhysicalDeviceSurfaceFormatsKHR(
device, pSurfaceDescription, pCount, pSurfaceFormats);
if ((result == VK_SUCCESS) && pDevice && pSurfaceFormats && pCount &&
@@ -498,7 +498,7 @@
return VK_ERROR_VALIDATION_FAILED;
}
-VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetSurfacePresentModesKHR(VkDevice device, const VkSurfaceDescriptionKHR* pSurfaceDescription, uint32_t* pCount, VkPresentModeKHR* pPresentModes)
+VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfacePresentModesKHR(VkDevice device, const VkSurfaceDescriptionKHR* pSurfaceDescription, uint32_t* pCount, VkPresentModeKHR* pPresentModes)
{
VkResult result = VK_SUCCESS;
VkBool32 skipCall = VK_FALSE;
@@ -515,12 +515,12 @@
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
"%s() called even though the %s extension was not enabled for this VkDevice.",
- __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
+ __FUNCTION__, VK_KHR_SWAPCHAIN_EXTENSION_NAME);
}
if (VK_FALSE == skipCall) {
// Call down the call chain:
- result = my_data->device_dispatch_table->GetSurfacePresentModesKHR(
+ result = my_data->device_dispatch_table->GetPhysicalDeviceSurfacePresentModesKHR(
device, pSurfaceDescription, pCount, pPresentModes);
if ((result == VK_SUCCESS) && pDevice && pPresentModes && pCount &&
@@ -567,7 +567,7 @@
return LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
"%s() called even though the %s extension was not enabled for this VkDevice.",
- fn, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME );
+ fn, VK_KHR_SWAPCHAIN_EXTENSION_NAME );
}
// Validate pCreateInfo with the results for previous queries:
@@ -575,12 +575,12 @@
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_CREATE_SWAP_WITHOUT_QUERY,
"%s() called before calling "
- "vkGetSurfacePropertiesKHR().",
+ "vkGetPhysicalDeviceSurfaceCapabilitiesKHR().",
fn);
} else {
// Validate pCreateInfo->minImageCount against
- // VkSurfacePropertiesKHR::{min|max}ImageCount:
- VkSurfacePropertiesKHR *pProps = &pDevice->surfaceProperties;
+ // VkSurfaceCapabilitiesKHR::{min|max}ImageCount:
+ VkSurfaceCapabilitiesKHR *pProps = &pDevice->surfaceProperties;
if ((pCreateInfo->minImageCount < pProps->minImageCount) ||
((pProps->maxImageCount > 0) &&
(pCreateInfo->minImageCount > pProps->maxImageCount))) {
@@ -588,7 +588,7 @@
SWAPCHAIN_CREATE_SWAP_BAD_MIN_IMG_COUNT,
"%s() called with pCreateInfo->minImageCount "
"= %d, which is outside the bounds returned "
- "by vkGetSurfacePropertiesKHR() (i.e. "
+ "by vkGetPhysicalDeviceSurfaceCapabilitiesKHR() (i.e. "
"minImageCount = %d, maxImageCount = %d).",
fn,
pCreateInfo->minImageCount,
@@ -596,7 +596,7 @@
pProps->maxImageCount);
}
// Validate pCreateInfo->imageExtent against
- // VkSurfacePropertiesKHR::{current|min|max}ImageExtent:
+ // VkSurfaceCapabilitiesKHR::{current|min|max}ImageExtent:
if ((pProps->currentExtent.width == -1) &&
((pCreateInfo->imageExtent.width < pProps->minImageExtent.width) ||
(pCreateInfo->imageExtent.width > pProps->maxImageExtent.width) ||
@@ -606,7 +606,7 @@
SWAPCHAIN_CREATE_SWAP_OUT_OF_BOUNDS_EXTENTS,
"%s() called with pCreateInfo->imageExtent = "
"(%d,%d), which is outside the bounds "
- "returned by vkGetSurfacePropertiesKHR(): "
+ "returned by vkGetPhysicalDeviceSurfaceCapabilitiesKHR(): "
"currentExtent = (%d,%d), minImageExtent = "
"(%d,%d), maxImageExtent = (%d,%d).",
fn,
@@ -627,7 +627,7 @@
"%s() called with pCreateInfo->imageExtent = "
"(%d,%d), which is not equal to the "
"currentExtent = (%d,%d) returned by "
- "vkGetSurfacePropertiesKHR().",
+ "vkGetPhysicalDeviceSurfaceCapabilitiesKHR().",
fn,
pCreateInfo->imageExtent.width,
pCreateInfo->imageExtent.height,
@@ -635,7 +635,7 @@
pProps->currentExtent.height);
}
// Validate pCreateInfo->preTransform against
- // VkSurfacePropertiesKHR::supportedTransforms:
+ // VkSurfaceCapabilitiesKHR::supportedTransforms:
if (!((1 << pCreateInfo->preTransform) & pProps->supportedTransforms)) {
// This is an error situation; one for which we'd like to give
// the developer a helpful, multi-line error message. Build it
@@ -669,7 +669,7 @@
errorString.c_str());
}
// Validate pCreateInfo->imageArraySize against
- // VkSurfacePropertiesKHR::maxImageArraySize:
+ // VkSurfaceCapabilitiesKHR::maxImageArraySize:
if (pCreateInfo->imageArraySize <= pProps->maxImageArraySize) {
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_CREATE_SWAP_BAD_IMG_ARRAY_SIZE,
@@ -681,7 +681,7 @@
pProps->maxImageArraySize);
}
// Validate pCreateInfo->imageUsageFlags against
- // VkSurfacePropertiesKHR::supportedUsageFlags:
+ // VkSurfaceCapabilitiesKHR::supportedUsageFlags:
if (pCreateInfo->imageUsageFlags &&
(pCreateInfo->imageUsageFlags !=
(pCreateInfo->imageUsageFlags & pProps->supportedUsageFlags))) {
@@ -699,7 +699,7 @@
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_CREATE_SWAP_WITHOUT_QUERY,
"%s() called before calling "
- "vkGetSurfaceFormatsKHR().",
+ "vkGetPhysicalDeviceSurfaceFormatsKHR().",
fn);
} else {
// Validate pCreateInfo->imageFormat against
@@ -757,11 +757,11 @@
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_CREATE_SWAP_WITHOUT_QUERY,
"%s() called before calling "
- "vkGetSurfacePresentModesKHR().",
+ "vkGetPhysicalDeviceSurfacePresentModesKHR().",
fn);
} else {
// Validate pCreateInfo->presentMode against
- // vkGetSurfacePresentModesKHR():
+ // vkGetPhysicalDeviceSurfacePresentModesKHR():
bool foundMatch = false;
for (uint32_t i = 0 ; i < pDevice->presentModeCount ; i++) {
if (pDevice->pPresentModes[i] == pCreateInfo->presentMode) {
@@ -832,7 +832,7 @@
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
"%s() called even though the %s extension was not enabled for this VkDevice.",
- __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
+ __FUNCTION__, VK_KHR_SWAPCHAIN_EXTENSION_NAME);
}
// Regardless of skipCall value, do some internal cleanup:
@@ -884,7 +884,7 @@
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
"%s() called even though the %s extension was not enabled for this VkDevice.",
- __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
+ __FUNCTION__, VK_KHR_SWAPCHAIN_EXTENSION_NAME);
}
SwpSwapchain *pSwapchain = &my_data->swapchainMap[swapchain];
if (!pSwapchain) {
@@ -938,7 +938,7 @@
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_DEVICE, device, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
"%s() called even though the %s extension was not enabled for this VkDevice.",
- __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
+ __FUNCTION__, VK_KHR_SWAPCHAIN_EXTENSION_NAME);
}
// Validate that a valid VkSwapchainKHR was used:
SwpSwapchain *pSwapchain = &my_data->swapchainMap[swapchain];
@@ -1012,7 +1012,7 @@
pSwapchain->pDevice, "VkDevice",
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
"%s() called even though the %s extension was not enabled for this VkDevice.",
- __FUNCTION__, VK_EXT_KHR_DEVICE_SWAPCHAIN_EXTENSION_NAME);
+ __FUNCTION__, VK_KHR_SWAPCHAIN_EXTENSION_NAME);
}
if (index >= pSwapchain->imageCount) {
skipCall |= LOG_ERROR(VK_OBJECT_TYPE_SWAPCHAIN_KHR,
@@ -1145,12 +1145,12 @@
if (my_data->deviceMap.size() != 0 &&
my_data->deviceMap[device].deviceSwapchainExtensionEnabled)
{
- if (!strcmp("vkGetSurfacePropertiesKHR", funcName))
- return reinterpret_cast<PFN_vkVoidFunction>(vkGetSurfacePropertiesKHR);
- if (!strcmp("vkGetSurfaceFormatsKHR", funcName))
- return reinterpret_cast<PFN_vkVoidFunction>(vkGetSurfaceFormatsKHR);
- if (!strcmp("vkGetSurfacePresentModesKHR", funcName))
- return reinterpret_cast<PFN_vkVoidFunction>(vkGetSurfacePresentModesKHR);
+ if (!strcmp("vkGetPhysicalDeviceSurfaceCapabilitiesKHR", funcName))
+ return reinterpret_cast<PFN_vkVoidFunction>(vkGetPhysicalDeviceSurfaceCapabilitiesKHR);
+ if (!strcmp("vkGetPhysicalDeviceSurfaceFormatsKHR", funcName))
+ return reinterpret_cast<PFN_vkVoidFunction>(vkGetPhysicalDeviceSurfaceFormatsKHR);
+ if (!strcmp("vkGetPhysicalDeviceSurfacePresentModesKHR", funcName))
+ return reinterpret_cast<PFN_vkVoidFunction>(vkGetPhysicalDeviceSurfacePresentModesKHR);
if (!strcmp("vkCreateSwapchainKHR", funcName))
return reinterpret_cast<PFN_vkVoidFunction>(vkCreateSwapchainKHR);
if (!strcmp("vkDestroySwapchainKHR", funcName))
diff --git a/layers/swapchain.h b/layers/swapchain.h
index da918ca..a3608a9 100644
--- a/layers/swapchain.h
+++ b/layers/swapchain.h
@@ -62,7 +62,7 @@
SWAPCHAIN_INVALID_HANDLE, // Handle used that isn't currently valid
SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED, // Did not enable WSI extension, but called WSI function
SWAPCHAIN_DEL_DEVICE_BEFORE_SWAPCHAINS, // Called vkDestroyDevice() before vkDestroySwapchainKHR()
- SWAPCHAIN_CREATE_SWAP_WITHOUT_QUERY, // Called vkCreateSwapchainKHR() without calling a query (e.g. vkGetSurfacePropertiesKHR())
+ SWAPCHAIN_CREATE_SWAP_WITHOUT_QUERY, // Called vkCreateSwapchainKHR() without calling a query (e.g. vkGetPhysicalDeviceSurfaceCapabilitiesKHR())
SWAPCHAIN_CREATE_SWAP_BAD_MIN_IMG_COUNT, // Called vkCreateSwapchainKHR() with out-of-bounds minImageCount
SWAPCHAIN_CREATE_SWAP_OUT_OF_BOUNDS_EXTENTS,// Called vkCreateSwapchainKHR() with out-of-bounds imageExtent
SWAPCHAIN_CREATE_SWAP_EXTENTS_NO_MATCH_WIN, // Called vkCreateSwapchainKHR() with imageExtent that doesn't match window's extent
@@ -126,7 +126,7 @@
// remembered:
unordered_map<const void*, SwpPhysicalDevice*> physicalDevices;
- // Set to true if "VK_EXT_KHR_swapchain" was enabled for this VkInstance:
+ // Set to true if VK_KHR_SURFACE_EXTENSION_NAME was enabled for this VkInstance:
bool swapchainExtensionEnabled;
// TODO: Add additional booleans for platform-specific extensions:
@@ -155,24 +155,24 @@
// Corresponding VkPhysicalDevice (and info) to this VkDevice:
SwpPhysicalDevice *pPhysicalDevice;
- // Set to true if "VK_EXT_KHR_device_swapchain" was enabled:
+ // Set to true if VK_KHR_SWAPCHAIN_EXTENSION_NAME was enabled:
bool deviceSwapchainExtensionEnabled;
// TODO: Record/use this info per-surface, not per-device, once a
// non-dispatchable surface object is added to WSI:
- // Results of vkGetSurfacePropertiesKHR():
+ // Results of vkGetPhysicalDeviceSurfaceCapabilitiesKHR():
bool gotSurfaceProperties;
- VkSurfacePropertiesKHR surfaceProperties;
+ VkSurfaceCapabilitiesKHR surfaceProperties;
// TODO: Record/use this info per-surface, not per-device, once a
// non-dispatchable surface object is added to WSI:
- // Count and VkSurfaceFormatKHR's returned by vkGetSurfaceFormatsKHR():
+ // Count and VkSurfaceFormatKHR's returned by vkGetPhysicalDeviceSurfaceFormatsKHR():
uint32_t surfaceFormatCount;
VkSurfaceFormatKHR* pSurfaceFormats;
// TODO: Record/use this info per-surface, not per-device, once a
// non-dispatchable surface object is added to WSI:
- // Count and VkPresentModeKHR's returned by vkGetSurfacePresentModesKHR():
+ // Count and VkPresentModeKHR's returned by vkGetPhysicalDeviceSurfacePresentModesKHR():
uint32_t presentModeCount;
VkPresentModeKHR* pPresentModes;
diff --git a/layers/vk_validation_layer_details.md b/layers/vk_validation_layer_details.md
index e6588d4..3b27175 100644
--- a/layers/vk_validation_layer_details.md
+++ b/layers/vk_validation_layer_details.md
@@ -334,10 +334,10 @@
| Check | Overview | ENUM SWAPCHAIN_* | Relevant API | Testname | Notes/TODO |
| ----- | -------- | ---------------- | ------------ | -------- | ---------- |
-| Valid handle | If an invalid handle is used, this error will be flagged | INVALID_HANDLE | vkDestroyInstance vkEnumeratePhysicalDevices vkCreateDevice vkDestroyDevice vkGetPhysicalDeviceSurfaceSupportKHR vkGetSurfacePropertiesKHR vkGetSurfaceFormatsKHR vkGetSurfacePresentModesKHR vkCreateSwapchainKHR vkDestroySwapchainKHR vkGetSwapchainImagesKHR vkAcquireNextImageKHR vkQueuePresentKHR | NA | None |
-| Extension enabled before use | Validates that a WSI extension is enabled before its functions are used | EXT_NOT_ENABLED_BUT_USED | vkGetPhysicalDeviceSurfaceSupportKHR vkGetSurfacePropertiesKHR vkGetSurfaceFormatsKHR vkGetSurfacePresentModesKHR vkCreateSwapchainKHR vkDestroySwapchainKHR vkGetSwapchainImagesKHR vkAcquireNextImageKHR vkQueuePresentKHR | NA | None |
+| Valid handle | If an invalid handle is used, this error will be flagged | INVALID_HANDLE | vkDestroyInstance vkEnumeratePhysicalDevices vkCreateDevice vkDestroyDevice vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceFormatsKHR vkGetPhysicalDeviceSurfacePresentModesKHR vkCreateSwapchainKHR vkDestroySwapchainKHR vkGetSwapchainImagesKHR vkAcquireNextImageKHR vkQueuePresentKHR | NA | None |
+| Extension enabled before use | Validates that a WSI extension is enabled before its functions are used | EXT_NOT_ENABLED_BUT_USED | vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceFormatsKHR vkGetPhysicalDeviceSurfacePresentModesKHR vkCreateSwapchainKHR vkDestroySwapchainKHR vkGetSwapchainImagesKHR vkAcquireNextImageKHR vkQueuePresentKHR | NA | None |
| Swapchains destroyed before devices | Validates that vkDestroySwapchainKHR() is called for all swapchains associated with a device before vkDestroyDevice() is called | DEL_DEVICE_BEFORE_SWAPCHAINS | vkDestroyDevice | NA | None |
-| Queries occur before swapchain creation | Validates that vkGetSurfacePropertiesKHR(), vkGetSurfaceFormatsKHR() and vkGetSurfacePresentModesKHR() are called before vkCreateSwapchainKHR() | CREATE_SWAP_WITHOUT_QUERY | vkCreateSwapchainKHR | NA | None |
+| Queries occur before swapchain creation | Validates that vkGetPhysicalDeviceSurfaceCapabilitiesKHR(), vkGetPhysicalDeviceSurfaceFormatsKHR() and vkGetPhysicalDeviceSurfacePresentModesKHR() are called before vkCreateSwapchainKHR() | CREATE_SWAP_WITHOUT_QUERY | vkCreateSwapchainKHR | NA | None |
| vkCreateSwapchainKHR(pCreateInfo->minImageCount) | Validates vkCreateSwapchainKHR(pCreateInfo->minImageCount) | CREATE_SWAP_BAD_MIN_IMG_COUNT | vkCreateSwapchainKHR | NA | None |
| vkCreateSwapchainKHR(pCreateInfo->imageExtent) | Validates vkCreateSwapchainKHR(pCreateInfo->imageExtent) when window has no fixed size | CREATE_SWAP_OUT_OF_BOUNDS_EXTENTS | vkCreateSwapchainKHR | NA | None |
| vkCreateSwapchainKHR(pCreateInfo->imageExtent) | Validates vkCreateSwapchainKHR(pCreateInfo->imageExtent) when window has a fixed size | CREATE_SWAP_EXTENTS_NO_MATCH_WIN | vkCreateSwapchainKHR | NA | None |
diff --git a/loader/loader.h b/loader/loader.h
index 40dcbd5..60e7d13 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -34,8 +34,9 @@
#include <vulkan/vulkan.h>
#include <vk_loader_platform.h>
+
#include <vulkan/vk_lunarg_debug_report.h>
-#include <vulkan/vk_ext_khr_swapchain.h>
+#include <vulkan/VK_KHR_surface.h>
#include <vulkan/vk_layer.h>
#include <vulkan/vk_icd.h>
#include <assert.h>
diff --git a/loader/table_ops.h b/loader/table_ops.h
index e468b0d..d7f5bfd 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -175,9 +175,9 @@
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->GetPhysicalDeviceSurfaceCapabilitiesKHR = (PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR) gpa(dev, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR");
+ table->GetPhysicalDeviceSurfaceFormatsKHR = (PFN_vkGetPhysicalDeviceSurfaceFormatsKHR) gpa(dev, "vkGetPhysicalDeviceSurfaceFormatsKHR");
+ table->GetPhysicalDeviceSurfacePresentModesKHR = (PFN_vkGetPhysicalDeviceSurfacePresentModesKHR) gpa(dev, "vkGetPhysicalDeviceSurfacePresentModesKHR");
table->GetSwapchainImagesKHR = (PFN_vkGetSwapchainImagesKHR) gpa(dev, "vkGetSwapchainImagesKHR");
table->QueuePresentKHR = (PFN_vkQueuePresentKHR) gpa(dev, "vkQueuePresentKHR");
}
diff --git a/loader/wsi_swapchain.c b/loader/wsi_swapchain.c
index 9070657..d35b297 100644
--- a/loader/wsi_swapchain.c
+++ b/loader/wsi_swapchain.c
@@ -33,8 +33,8 @@
#include "wsi_swapchain.h"
static const VkExtensionProperties wsi_swapchain_extension_info = {
- .extensionName = VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME,
- .specVersion = VK_EXT_KHR_SWAPCHAIN_REVISION,
+ .extensionName = VK_KHR_SURFACE_EXTENSION_NAME,
+ .specVersion = VK_KHR_SURFACE_REVISION,
};
void wsi_swapchain_add_instance_extensions(
@@ -51,7 +51,7 @@
ptr_instance->wsi_swapchain_enabled = false;
for (uint32_t i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) {
- if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME) == 0) {
+ if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SURFACE_EXTENSION_NAME) == 0) {
ptr_instance->wsi_swapchain_enabled = true;
return;
}
diff --git a/loader/wsi_swapchain.h b/loader/wsi_swapchain.h
index 416d659..a225bc8 100644
--- a/loader/wsi_swapchain.h
+++ b/loader/wsi_swapchain.h
@@ -26,7 +26,7 @@
#include "vk_loader_platform.h"
#include "loader.h"
-#include "vulkan/vk_ext_khr_swapchain.h"
+#include "vulkan/VK_KHR_surface.h"
bool wsi_swapchain_instance_gpa(struct loader_instance *ptr_instance,
const char* name, void **addr);
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 92dac8f..1ea6f5e 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -26,8 +26,8 @@
*/
#include "vkrenderframework.h"
-#include <vulkan/vk_ext_khr_swapchain.h>
-#include <vulkan/vk_ext_khr_device_swapchain.h>
+#include <vulkan/VK_KHR_surface.h>
+#include <vulkan/VK_KHR_swapchain.h>
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
#define GET_DEVICE_PROC_ADDR(dev, entrypoint) \
@@ -177,19 +177,19 @@
VkResult err;
// Get the list of VkFormat's that are supported:
- PFN_vkGetSurfaceFormatsKHR fpGetSurfaceFormatsKHR;
+ PFN_vkGetPhysicalDeviceSurfaceFormatsKHR fpGetPhysicalDeviceSurfaceFormatsKHR;
uint32_t formatCount;
VkSurfaceDescriptionKHR surface_description;
surface_description.sType = VK_STRUCTURE_TYPE_SURFACE_DESCRIPTION_WINDOW_KHR;
surface_description.pNext = NULL;
- GET_DEVICE_PROC_ADDR(device(), GetSurfaceFormatsKHR);
- err = fpGetSurfaceFormatsKHR(device(),
+ GET_DEVICE_PROC_ADDR(device(), GetPhysicalDeviceSurfaceFormatsKHR);
+ err = fpGetPhysicalDeviceSurfaceFormatsKHR(device(),
(VkSurfaceDescriptionKHR *) &surface_description,
&formatCount, NULL);
ASSERT_VK_SUCCESS(err);
VkSurfaceFormatKHR *surfFormats =
(VkSurfaceFormatKHR *)malloc(formatCount * sizeof(VkSurfaceFormatKHR));
- err = fpGetSurfaceFormatsKHR(device(),
+ err = fpGetPhysicalDeviceSurfaceFormatsKHR(device(),
(VkSurfaceDescriptionKHR *) &surface_description,
&formatCount, surfFormats);
ASSERT_VK_SUCCESS(err);
diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index 71ff6b0..3793f34 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -33,8 +33,8 @@
#ifndef _WIN32
#include <xcb/xcb.h>
#endif
-#include "vulkan/vk_ext_khr_swapchain.h"
-#include "vulkan/vk_ext_khr_device_swapchain.h"
+#include "vulkan/VK_KHR_surface.h"
+#include "vulkan/VK_KHR_swapchain.h"
#if defined(PATH_MAX) && !defined(MAX_PATH)
#define MAX_PATH PATH_MAX
@@ -137,9 +137,9 @@
uint32_t m_present_queue_node_index;
PFN_vkGetPhysicalDeviceSurfaceSupportKHR m_fpGetPhysicalDeviceSurfaceSupportKHR;
- PFN_vkGetSurfacePropertiesKHR m_fpGetSurfacePropertiesKHR;
- PFN_vkGetSurfaceFormatsKHR m_fpGetSurfaceFormatsKHR;
- PFN_vkGetSurfacePresentModesKHR m_fpGetSurfacePresentModesKHR;
+ PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR m_fpGetPhysicalDeviceSurfaceCapabilitiesKHR;
+ PFN_vkGetPhysicalDeviceSurfaceFormatsKHR m_fpGetPhysicalDeviceSurfaceFormatsKHR;
+ PFN_vkGetPhysicalDeviceSurfacePresentModesKHR m_fpGetPhysicalDeviceSurfacePresentModesKHR;
PFN_vkCreateSwapchainKHR m_fpCreateSwapchainKHR;
PFN_vkDestroySwapchainKHR m_fpDestroySwapchainKHR;
PFN_vkGetSwapchainImagesKHR m_fpGetSwapchainImagesKHR;
@@ -546,7 +546,7 @@
memoryBarrier.pNext = NULL;
memoryBarrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
memoryBarrier.dstAccessMask = 0;
- memoryBarrier.oldLayout = VK_IMAGE_LAYOUT_PRESENT_SOURCE_KHR;
+ memoryBarrier.oldLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
memoryBarrier.newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
memoryBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
memoryBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
@@ -575,7 +575,7 @@
1, ®ion);
memoryBarrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
- memoryBarrier.newLayout = VK_IMAGE_LAYOUT_PRESENT_SOURCE_KHR;
+ memoryBarrier.newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
vkCmdPipelineBarrier(m_cmdbuf.handle(), VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
0, 1, (const void * const*)&pmemory_barrier);
m_cmdbuf.end();
@@ -820,13 +820,13 @@
// Get the list of VkFormat's that are supported:
uint32_t formatCount;
- err = m_fpGetSurfaceFormatsKHR(m_device.handle(),
+ err = m_fpGetPhysicalDeviceSurfaceFormatsKHR(m_device.handle(),
(VkSurfaceDescriptionKHR *) &m_surface_description,
&formatCount, NULL);
assert(!err);
VkSurfaceFormatKHR *surfFormats =
(VkSurfaceFormatKHR *)malloc(formatCount * sizeof(VkSurfaceFormatKHR));
- err = m_fpGetSurfaceFormatsKHR(m_device.handle(),
+ err = m_fpGetPhysicalDeviceSurfaceFormatsKHR(m_device.handle(),
(VkSurfaceDescriptionKHR *) &m_surface_description,
&formatCount, surfFormats);
assert(!err);
@@ -845,21 +845,21 @@
m_color_space = surfFormats[0].colorSpace;
// Check the surface proprties and formats
- VkSurfacePropertiesKHR surfProperties;
- err = m_fpGetSurfacePropertiesKHR(m_device.handle(),
+ VkSurfaceCapabilitiesKHR surfProperties;
+ err = m_fpGetPhysicalDeviceSurfaceCapabilitiesKHR(m_device.handle(),
(const VkSurfaceDescriptionKHR *)&m_surface_description,
&surfProperties);
assert(!err);
uint32_t presentModeCount;
- err = m_fpGetSurfacePresentModesKHR(m_device.handle(),
+ err = m_fpGetPhysicalDeviceSurfacePresentModesKHR(m_device.handle(),
(const VkSurfaceDescriptionKHR *)&m_surface_description,
&presentModeCount, NULL);
assert(!err);
VkPresentModeKHR *presentModes =
(VkPresentModeKHR *)malloc(presentModeCount * sizeof(VkPresentModeKHR));
assert(presentModes);
- err = m_fpGetSurfacePresentModesKHR(m_device.handle(),
+ err = m_fpGetPhysicalDeviceSurfacePresentModesKHR(m_device.handle(),
(const VkSurfaceDescriptionKHR *)&m_surface_description,
&presentModeCount, presentModes);
assert(!err);
@@ -981,7 +981,7 @@
/* Set image layout to PRESENT_SOURCE_KHR so that before the copy, it can be set to */
/* TRANSFER_DESTINATION_OPTIMAL */
SetImageLayout(m_buffers[i].image, VK_IMAGE_ASPECT_COLOR_BIT,
- VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_PRESENT_SOURCE_KHR);
+ VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);
}
}
@@ -1061,9 +1061,9 @@
void TestFrameworkVkPresent::InitPresentFramework(std::list<VkTestImageRecord> &imagesIn, VkInstance inst)
{
GET_INSTANCE_PROC_ADDR(inst, GetPhysicalDeviceSurfaceSupportKHR);
- GET_DEVICE_PROC_ADDR(m_device.handle(), GetSurfacePropertiesKHR);
- GET_DEVICE_PROC_ADDR(m_device.handle(), GetSurfaceFormatsKHR);
- GET_DEVICE_PROC_ADDR(m_device.handle(), GetSurfacePresentModesKHR);
+ GET_DEVICE_PROC_ADDR(m_device.handle(), GetPhysicalDeviceSurfaceCapabilitiesKHR);
+ GET_DEVICE_PROC_ADDR(m_device.handle(), GetPhysicalDeviceSurfaceFormatsKHR);
+ GET_DEVICE_PROC_ADDR(m_device.handle(), GetPhysicalDeviceSurfacePresentModesKHR);
GET_DEVICE_PROC_ADDR(m_device.handle(), CreateSwapchainKHR);
GET_DEVICE_PROC_ADDR(m_device.handle(), CreateSwapchainKHR);
GET_DEVICE_PROC_ADDR(m_device.handle(), DestroySwapchainKHR);