diff options
| -rw-r--r-- | vulkan/libvulkan/driver.cpp | 4 | ||||
| -rw-r--r-- | vulkan/nulldrv/null_driver.cpp | 4 | ||||
| -rw-r--r-- | vulkan/vkjson/vkjson.cc | 4 | ||||
| -rw-r--r-- | vulkan/vkjson/vkjson.h | 8 |
4 files changed, 6 insertions, 14 deletions
diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp index ffc7c94566..648353ee1d 100644 --- a/vulkan/libvulkan/driver.cpp +++ b/vulkan/libvulkan/driver.cpp @@ -1115,7 +1115,7 @@ VkResult CreateInstance(const VkInstanceCreateInfo* pCreateInfo, if (result != VK_SUCCESS) return result; - icd_api_version ^= VK_VERSION_PATCH(icd_api_version); + icd_api_version ^= VK_API_VERSION_PATCH(icd_api_version); } CreateInfoWrapper wrapper(*pCreateInfo, icd_api_version, data_allocator); @@ -1199,7 +1199,7 @@ VkResult CreateDevice(VkPhysicalDevice physicalDevice, CreateInfoWrapper wrapper( physicalDevice, *pCreateInfo, - properties.apiVersion ^ VK_VERSION_PATCH(properties.apiVersion), + properties.apiVersion ^ VK_API_VERSION_PATCH(properties.apiVersion), data_allocator); VkResult result = wrapper.Validate(); if (result != VK_SUCCESS) diff --git a/vulkan/nulldrv/null_driver.cpp b/vulkan/nulldrv/null_driver.cpp index ddc5cbd77f..a9f37e56cf 100644 --- a/vulkan/nulldrv/null_driver.cpp +++ b/vulkan/nulldrv/null_driver.cpp @@ -397,8 +397,8 @@ VkResult EnumerateDeviceExtensionProperties(VkPhysicalDevice /*gpu*/, void GetPhysicalDeviceProperties(VkPhysicalDevice, VkPhysicalDeviceProperties* properties) { - properties->apiVersion = VK_MAKE_VERSION(1, 0, VK_HEADER_VERSION); - properties->driverVersion = VK_MAKE_VERSION(0, 0, 1); + properties->apiVersion = VK_MAKE_API_VERSION(0, 1, 2, VK_HEADER_VERSION); + properties->driverVersion = VK_MAKE_API_VERSION(0, 0, 0, 1); properties->vendorID = 0; properties->deviceID = 0; properties->deviceType = VK_PHYSICAL_DEVICE_TYPE_OTHER; diff --git a/vulkan/vkjson/vkjson.cc b/vulkan/vkjson/vkjson.cc index 438e5dd10d..bdb76484d0 100644 --- a/vulkan/vkjson/vkjson.cc +++ b/vulkan/vkjson/vkjson.cc @@ -841,7 +841,7 @@ template <typename Visitor> inline bool Iterate(Visitor* visitor, VkJsonDevice* device) { bool ret = true; switch (device->properties.apiVersion ^ - VK_VERSION_PATCH(device->properties.apiVersion)) { + VK_API_VERSION_PATCH(device->properties.apiVersion)) { case VK_API_VERSION_1_2: FALLTHROUGH_INTENDED; case VK_API_VERSION_1_1: @@ -897,7 +897,7 @@ inline bool Iterate(Visitor* visitor, VkJsonDevice* device) { template <typename Visitor> inline bool Iterate(Visitor* visitor, VkJsonInstance* instance) { bool ret = true; - switch (instance->api_version ^ VK_VERSION_PATCH(instance->api_version)) { + switch (instance->api_version ^ VK_API_VERSION_PATCH(instance->api_version)) { case VK_API_VERSION_1_2: FALLTHROUGH_INTENDED; case VK_API_VERSION_1_1: diff --git a/vulkan/vkjson/vkjson.h b/vulkan/vkjson/vkjson.h index 52e7bee288..aca1d6085e 100644 --- a/vulkan/vkjson/vkjson.h +++ b/vulkan/vkjson/vkjson.h @@ -33,14 +33,6 @@ #undef max #endif -#ifndef VK_API_VERSION_1_0 -#define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) -#endif - -#ifndef VK_API_VERSION_1_1 -#define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0) -#endif - /* * Annotation to tell clang that we intend to fall through from one case to * another in a switch. Sourced from android-base/macros.h. |