Use the shorter promoted Vulkan structure and enum names
Bug: b/198327618
Change-Id: I0f799a04621c40cc95bf1d0694b908f1bb29c16a
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/56808
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Sean Risser <srisser@google.com>
diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp
index f5ca7af..efa6b92 100644
--- a/src/Vulkan/VkPhysicalDevice.cpp
+++ b/src/Vulkan/VkPhysicalDevice.cpp
@@ -898,7 +898,7 @@
properties->conformanceVersion = { 1, 1, 3, 3 };
}
-void PhysicalDevice::getProperties(VkPhysicalDeviceDriverPropertiesKHR *properties) const
+void PhysicalDevice::getProperties(VkPhysicalDeviceDriverProperties *properties) const
{
getDriverProperties(properties);
}
diff --git a/src/Vulkan/VkPhysicalDevice.hpp b/src/Vulkan/VkPhysicalDevice.hpp
index b79a94a..31647f5 100644
--- a/src/Vulkan/VkPhysicalDevice.hpp
+++ b/src/Vulkan/VkPhysicalDevice.hpp
@@ -56,7 +56,7 @@
void getProperties(const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo, VkExternalFenceProperties *pExternalFenceProperties) const;
void getProperties(const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo, VkExternalSemaphoreProperties *pExternalSemaphoreProperties) const;
void getProperties(VkPhysicalDeviceExternalMemoryHostPropertiesEXT *properties) const;
- void getProperties(VkPhysicalDeviceDriverPropertiesKHR *properties) const;
+ void getProperties(VkPhysicalDeviceDriverProperties *properties) const;
void getProperties(VkPhysicalDeviceLineRasterizationPropertiesEXT *properties) const;
void getProperties(VkPhysicalDeviceProvokingVertexPropertiesEXT *properties) const;
void getProperties(VkPhysicalDeviceFloatControlsProperties *) const;
diff --git a/src/Vulkan/libVulkan.cpp b/src/Vulkan/libVulkan.cpp
index 2a49a55..dd44cc5 100644
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -1882,7 +1882,7 @@
{
switch(extensionCreateInfo->sType)
{
- case VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR:
+ case VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO:
{
const VkImageViewUsageCreateInfo *multiviewCreateInfo = reinterpret_cast<const VkImageViewUsageCreateInfo *>(extensionCreateInfo);
ASSERT(!(~vk::Cast(pCreateInfo->image)->getUsage() & multiviewCreateInfo->usage));
@@ -3131,9 +3131,9 @@
vk::Cast(physicalDevice)->getProperties(properties);
}
break;
- case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR:
+ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES:
{
- auto properties = reinterpret_cast<VkPhysicalDeviceDriverPropertiesKHR *>(extensionProperties);
+ auto properties = reinterpret_cast<VkPhysicalDeviceDriverProperties *>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(properties);
}
break;
@@ -3157,7 +3157,7 @@
vk::Cast(physicalDevice)->getProperties(properties);
}
break;
- case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR:
+ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES:
{
auto properties = reinterpret_cast<VkPhysicalDeviceFloatControlsProperties *>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(properties);
@@ -3290,7 +3290,7 @@
{
switch(extensionFormatInfo->sType)
{
- case VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR:
+ case VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO:
{
// Per the Vulkan spec on VkImageFormatListcreateInfo:
// "If the pNext chain of VkImageCreateInfo includes a
