From fc8a7348495b886bb7caa5b4a6f539ea2c53c774 Mon Sep 17 00:00:00 2001 From: Ernst Persson Date: Sun, 27 Jul 2025 13:46:57 +0200 Subject: [PATCH] amd/vulkan: Use str.removesuffix() from Python 3.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ernst Persson Reviewed-by: Marek Olšák Acked-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/layers/radv_annotate_layer_gen.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/amd/vulkan/layers/radv_annotate_layer_gen.py b/src/amd/vulkan/layers/radv_annotate_layer_gen.py index 7878a9fcda1..fee4d116d4e 100644 --- a/src/amd/vulkan/layers/radv_annotate_layer_gen.py +++ b/src/amd/vulkan/layers/radv_annotate_layer_gen.py @@ -52,17 +52,6 @@ annotate_${c.name}(${c.decl_params()}) % endfor """) -# str.removesuffix requires python 3.9+ so implement our own to not break build -# on older versions -def removesuffix(s, suffix): - l = len(suffix) - if l == 0: - return s - idx = s.find(suffix) - if idx == len(s) - l: - return s[:-l] - return s - def main(): parser = argparse.ArgumentParser() @@ -79,7 +68,7 @@ def main(): if not e.name.startswith('Cmd') or e.alias or e.return_type != "void": continue - stripped_name = removesuffix(removesuffix(removesuffix(e.name, 'EXT'), 'KHR'), '2') + stripped_name = e.name.removesuffix('EXT').removesuffix('KHR').removesuffix('2') if stripped_name in commands_names or stripped_name in EXCLUDED_COMMANDS: continue