From 8cbfcab425e4430f044f2c5bb20bc54f75b700a6 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 20 Feb 2019 10:34:24 +0000 Subject: [PATCH] anv: make sure the extensions stay sorted Signed-off-by: Eric Engestrom Reviewed-by: Jason Ekstrand --- src/intel/vulkan/anv_extensions.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py index 49ac28f9a84..a6c05d73c96 100644 --- a/src/intel/vulkan/anv_extensions.py +++ b/src/intel/vulkan/anv_extensions.py @@ -141,6 +141,26 @@ EXTENSIONS = [ Extension('VK_GOOGLE_hlsl_functionality1', 1, True), ] +# Sort the extension list the way we expect: KHR, then EXT, then vendors +# alphabetically. For digits, read them as a whole number sort that. +# eg.: VK_KHR_8bit_storage < VK_KHR_16bit_storage < VK_EXT_acquire_xlib_display +def extension_order(ext): + order = [] + for substring in re.split('(KHR|EXT|[0-9]+)', ext.name): + if substring == 'KHR': + order.append(1) + if substring == 'EXT': + order.append(2) + elif substring.isdigit(): + order.append(int(substring)) + else: + order.append(substring) + return order +for i in range(len(EXTENSIONS) - 1): + if extension_order(EXTENSIONS[i + 1]) < extension_order(EXTENSIONS[i]): + print(EXTENSIONS[i + 1].name + ' should come before ' + EXTENSIONS[i].name) + exit(1) + class VkVersion: def __init__(self, string): split = string.split('.') -- 2.11.0