From 6bb524e48e95eaa40f386cd396f79c283b73d1ed Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Wed, 13 Jul 2022 10:39:35 -0700
Subject: [PATCH] vulkan: sort ALLOWED_ANDROID_VERSION by api levels

v2: fix ordering of VK_KHR_driver_properties

Reviewed-by: Emma Anholt <emma@anholt.net> (v1)
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Acked-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17526>
---
 src/vulkan/util/vk_extensions.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vulkan/util/vk_extensions.py b/src/vulkan/util/vk_extensions.py
index f3afc160c7a..949c3e9f222 100644
--- a/src/vulkan/util/vk_extensions.py
+++ b/src/vulkan/util/vk_extensions.py
@@ -157,15 +157,12 @@ ALLOWED_ANDROID_VERSION = {
     "VK_KHR_display_swapchain": 26,
     "VK_KHR_sampler_mirror_clamp_to_edge": 26,
     "VK_KHR_shader_draw_parameters": 26,
-    "VK_KHR_shader_float_controls": 29,
-    "VK_KHR_shader_float16_int8": 29,
     "VK_KHR_maintenance1": 26,
     "VK_KHR_push_descriptor": 26,
     "VK_KHR_descriptor_update_template": 26,
     "VK_KHR_incremental_present": 26,
     "VK_KHR_shared_presentable_image": 26,
     "VK_KHR_storage_buffer_storage_class": 28,
-    "VK_KHR_8bit_storage": 29,
     "VK_KHR_16bit_storage": 28,
     "VK_KHR_get_memory_requirements2": 28,
     "VK_KHR_external_memory": 28,
@@ -190,8 +187,11 @@ ALLOWED_ANDROID_VERSION = {
     "VK_KHR_maintenance3": 28,
     "VK_KHR_draw_indirect_count": 28,
     "VK_KHR_create_renderpass2": 28,
-    "VK_KHR_depth_stencil_resolve": 29,
     "VK_KHR_driver_properties": 28,
+    "VK_KHR_shader_float_controls": 29,
+    "VK_KHR_shader_float16_int8": 29,
+    "VK_KHR_8bit_storage": 29,
+    "VK_KHR_depth_stencil_resolve": 29,
     "VK_KHR_swapchain_mutable_format": 29,
     "VK_KHR_shader_atomic_int64": 29,
     "VK_KHR_vulkan_memory_model": 29,