diff options
| author | 2021-08-23 16:37:18 +0000 | |
|---|---|---|
| committer | 2022-01-24 15:54:20 +0000 | |
| commit | b68a2251024524f64447dc858aa3f017e07fdf78 (patch) | |
| tree | ad3fea6718ea3acefea779fbf1e9e7fbfda3f960 /vulkan/vkjson | |
| parent | fa7af492359030e28391e1a13d7b9749057d3603 (diff) | |
Deprecate old VK_* defines
Bug: 191881132
Test: build
Change-Id: If7ff23e465b54258c9e2445981cbc11cbe14e174
Diffstat (limited to 'vulkan/vkjson')
| -rw-r--r-- | vulkan/vkjson/vkjson.cc | 4 | ||||
| -rw-r--r-- | vulkan/vkjson/vkjson.h | 8 |
2 files changed, 2 insertions, 10 deletions
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. |