summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Macnak <natsu@google.com> 2021-03-16 20:30:19 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-03-16 20:30:19 +0000
commit3ce4a1b9a230eeebdf8ee8a27317ab9e8f86bb76 (patch)
treea799cce7da94e2d1c8898cc426cde8c4b0cfffd0
parent0c3c5f8dc1d02401876163b702c1c3bc4fd58ce5 (diff)
parentce91d771851d7e08131ab931f02a5b0931a8fc76 (diff)
Merge "Allow VK_API_VERSION_1_2 in VkJson"
-rw-r--r--vulkan/vkjson/vkjson.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/vulkan/vkjson/vkjson.cc b/vulkan/vkjson/vkjson.cc
index a513239061..438e5dd10d 100644
--- a/vulkan/vkjson/vkjson.cc
+++ b/vulkan/vkjson/vkjson.cc
@@ -842,6 +842,8 @@ inline bool Iterate(Visitor* visitor, VkJsonDevice* device) {
bool ret = true;
switch (device->properties.apiVersion ^
VK_VERSION_PATCH(device->properties.apiVersion)) {
+ case VK_API_VERSION_1_2:
+ FALLTHROUGH_INTENDED;
case VK_API_VERSION_1_1:
ret &=
visitor->Visit("subgroupProperties", &device->subgroup_properties) &&
@@ -896,6 +898,8 @@ template <typename Visitor>
inline bool Iterate(Visitor* visitor, VkJsonInstance* instance) {
bool ret = true;
switch (instance->api_version ^ VK_VERSION_PATCH(instance->api_version)) {
+ case VK_API_VERSION_1_2:
+ FALLTHROUGH_INTENDED;
case VK_API_VERSION_1_1:
ret &= visitor->Visit("deviceGroups", &instance->device_groups);
FALLTHROUGH_INTENDED;