ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

magnum-shaderconverter: use the less error-prone >= for flag checks. 

Otherwise if some feature flags are combinations, & alone won't fail if
only a subset is set.
pull/495/head
Vladimír Vondruš 5 years ago
parent
20dd2914c5
commit
c477836396
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/Magnum/ShaderTools/shaderconverter.cpp

12
src/Magnum/ShaderTools/shaderconverter.cpp
Unescape View File

@ -335,7 +335,7 @@ see documentation of a particular converter for more information.)")
Containers::Array<std::pair<ShaderTools::Stage, Containers::StringView>> linkInputs; Containers::Array<std::pair<ShaderTools::Stage, Containers::StringView>> linkInputs;
if(i == 0) { if(i == 0) {
if((args.isSet("preprocess-only") || args.arrayValueCount("define") || args.arrayValueCount("undefine"))) { if((args.isSet("preprocess-only") || args.arrayValueCount("define") || args.arrayValueCount("undefine"))) {
if(!(converter->features() & ShaderTools::ConverterFeature::Preprocess)) { if(!(converter->features() >= ShaderTools::ConverterFeature::Preprocess)) {
Error{} << "The -E / -D / -U options are set, but" << converterName << "doesn't support preprocessing"; Error{} << "The -E / -D / -U options are set, but" << converterName << "doesn't support preprocessing";
return 10; return 10;
} }
@ -360,7 +360,7 @@ see documentation of a particular converter for more information.)")
} }
if(!args.value<Containers::StringView>("optimize").isEmpty()) { if(!args.value<Containers::StringView>("optimize").isEmpty()) {
if(!(converter->features() & ShaderTools::ConverterFeature::Optimize)) { if(!(converter->features() >= ShaderTools::ConverterFeature::Optimize)) {
Error{} << "The -O option is set, but" << converterName << "doesn't support optimization"; Error{} << "The -O option is set, but" << converterName << "doesn't support optimization";
return 11; return 11;
} }
@ -369,7 +369,7 @@ see documentation of a particular converter for more information.)")
} }
if(!args.value<Containers::StringView>("debug-info").isEmpty()) { if(!args.value<Containers::StringView>("debug-info").isEmpty()) {
if(!(converter->features() & ShaderTools::ConverterFeature::DebugInfo)) { if(!(converter->features() >= ShaderTools::ConverterFeature::DebugInfo)) {
Error{} << "The -g option is set, but" << converterName << "doesn't support debug info"; Error{} << "The -g option is set, but" << converterName << "doesn't support debug info";
return 12; return 12;
} }
@ -394,7 +394,7 @@ see documentation of a particular converter for more information.)")
re-entered again */ re-entered again */
CORRADE_INTERNAL_ASSERT(i == 0); CORRADE_INTERNAL_ASSERT(i == 0);
if(!(converter->features() & ShaderTools::ConverterFeature::ValidateFile)) { if(!(converter->features() >= ShaderTools::ConverterFeature::ValidateFile)) {
Error{} << converterName << "doesn't support file validation"; Error{} << converterName << "doesn't support file validation";
return 13; return 13;
} }
@ -417,7 +417,7 @@ see documentation of a particular converter for more information.)")
/* This is the first *and* last --converter, go from a file to a file */ /* This is the first *and* last --converter, go from a file to a file */
if(i == 0 && converterCount <= 1) { if(i == 0 && converterCount <= 1) {
if(!(converter->features() & ShaderTools::ConverterFeature::ConvertFile)) { if(!(converter->features() >= ShaderTools::ConverterFeature::ConvertFile)) {
Error{} << converterName << "doesn't support file conversion"; Error{} << converterName << "doesn't support file conversion";
return 15; return 15;
} }
@ -441,7 +441,7 @@ see documentation of a particular converter for more information.)")
/* Otherwise we need to go through data */ /* Otherwise we need to go through data */
} else { } else {
if(!(converter->features() & ShaderTools::ConverterFeature::ConvertData)) { if(!(converter->features() >= ShaderTools::ConverterFeature::ConvertData)) {
Error{} << converterName << "doesn't support data conversion"; Error{} << converterName << "doesn't support data conversion";
return 18; return 18;
} }

Write Preview
Loading…
Cancel
Save