Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cc33770 authored by Jason Macnak's avatar Jason Macnak Committed by Automerger Merge Worker
Browse files

Merge "Allow VK_API_VERSION_1_2 in VkJson" am: 3ce4a1b9

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1637597

Change-Id: Ib808aa5bcdd66d493eefc69cff1b5a9161b8886c
parents a8a23bbc 3ce4a1b9
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -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;