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

Commit ce91d771 authored by Jason Macnak's avatar Jason Macnak
Browse files

Allow VK_API_VERSION_1_2 in VkJson 

... which just falls through to VK_API_VERSION_1_1.
SwiftShader has started to advertise 1.2 with aosp/1634282.

Bug: b/182850741
Test: cts -m CtsGraphicsTestCases -t android.graphics.cts.VulkanFeaturesTest
Change-Id: I9845eafb8fd4b3df196302d1e4b53809b80dc669
parent 790e1ba9

vulkan/vkjson/vkjson.cc

+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;