From c9d28af5d409b66cda3ecaef020123affdd04601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 30 Oct 2020 17:26:30 +0100 Subject: [PATCH] shaderconverter: hmm, this is wrong. --- src/Magnum/ShaderTools/shaderconverter.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Magnum/ShaderTools/shaderconverter.cpp b/src/Magnum/ShaderTools/shaderconverter.cpp index 4785e32b3..9f2c79043 100644 --- a/src/Magnum/ShaderTools/shaderconverter.cpp +++ b/src/Magnum/ShaderTools/shaderconverter.cpp @@ -217,14 +217,17 @@ converter for more information.)") Error{} << "Multiple input files are allowed only for --link"; return 3; } + } + if(args.isSet("validate") || args.isSet("link")) { if(args.isSet("preprocess-only")) { - Error{} << "The --preprocess-only option isn't allowed for --link"; + Error{} << "The --preprocess-only option isn't allowed for --validate or --link"; return 4; } - } - if((args.isSet("validate") || args.isSet("link")) && args.arrayValueCount("converter") > 1) { - Error{} << "Cannot use multiple converters with --validate or --link"; - return 5; + + if(args.arrayValueCount("converter") > 1) { + Error{} << "Cannot use multiple converters with --validate or --link"; + return 5; + } } if(args.isSet("quiet") && args.isSet("verbose")) { Error{} << "Can't set both --quiet and --verbose";