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

Commit 612281d2 authored by Chris Forbes's avatar Chris Forbes
Browse files

Allow vkjson to report on 1.4 instances 

Does not yet output any 1.4 capabilities, but allows the tool to at
least work.

Bug: b/370568136
Flag: NONE bugfix
Change-Id: I969581e9472d8cfd789dd3e5f9b750e54c91c4df
parent 8f9e4e1e

vulkan/vkjson/vkjson.cc

+5 −0
Original line number Diff line number Diff line
@@ -1050,6 +1050,9 @@ inline bool Iterate(Visitor* visitor, VkJsonDevice* device) { 
  bool ret = true;

  switch (device->properties.apiVersion ^

          VK_API_VERSION_PATCH(device->properties.apiVersion)) {

    case VK_API_VERSION_1_4:

      // TODO: real 1.4 support here

      FALLTHROUGH_INTENDED;

    case VK_API_VERSION_1_3:

      ret &= visitor->Visit("core13", &device->core13);

      FALLTHROUGH_INTENDED;
@@ -1110,6 +1113,8 @@ template <typename Visitor> 
inline bool Iterate(Visitor* visitor, VkJsonInstance* instance) {

  bool ret = true;

  switch (instance->api_version ^ VK_API_VERSION_PATCH(instance->api_version)) {

    case VK_API_VERSION_1_4:

      FALLTHROUGH_INTENDED;

    case VK_API_VERSION_1_3:

      FALLTHROUGH_INTENDED;

    case VK_API_VERSION_1_2: