From 8aca557163880ab65ad32c373ef03ecf56a71c71 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Wed, 24 Feb 2016 15:04:11 -0700 Subject: loader: GH PR17, Add windows support for new displayserver types --- loader/vk-loader-generate.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/loader/vk-loader-generate.py b/loader/vk-loader-generate.py index e1226f59..235851c1 100755 --- a/loader/vk-loader-generate.py +++ b/loader/vk-loader-generate.py @@ -453,6 +453,16 @@ class LoaderGetProcAddrSubcommand(Subcommand): return "\n".join(body) def main(): + + wsi = { + "Win32", + "Android", + "Xcb", + "Xlib", + "Wayland", + "Mir" + } + subcommands = { "dev-ext-trampoline": DevExtTrampolineSubcommand, "loader-entrypoints": LoaderEntrypointsSubcommand, @@ -461,13 +471,14 @@ def main(): "loader-get-proc-addr": LoaderGetProcAddrSubcommand, } - if len(sys.argv) < 2 or sys.argv[1] not in subcommands: - print("Usage: %s [options]" % sys.argv[0]) + if len(sys.argv) < 3 or sys.argv[1] not in wsi or sys.argv[2] not in subcommands: + print("Usage: %s [options]" % sys.argv[0]) print - print("Available sucommands are: %s" % " ".join(subcommands)) + print("Available wsi (displayservers) are: %s" % " ".join(wsi)) + print("Available subcommands are: %s" % " ".join(subcommands)) exit(1) - subcmd = subcommands[sys.argv[1]](sys.argv[2:]) + subcmd = subcommands[sys.argv[2]](sys.argv[3:]) subcmd.run() if __name__ == "__main__": -- cgit v1.2.3