Disallow ASTC options when format is not ASTC (#809)

Fixes #808.
KhronosGroup · Dec 7, 2023 · d3ef5ed · d3ef5ed
1 parent f8220ec
commit d3ef5ed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/tests/cts b/tests/cts
diff --git a/tools/ktx/command_create.cpp b/tools/ktx/command_create.cpp
@@ -555,6 +555,11 @@ struct OptionsASTC : public ktxAstcParams {
     inline static const char* kAstcQuality = "astc-quality";
     inline static const char* kAstcPerceptual = "astc-perceptual";
 
+    inline static const char* kAstcOptions[] = {
+        kAstcQuality,
+        kAstcPerceptual
+    };
+
     std::string astcOptions{};
     bool encodeASTC = false;
     ClampedOption<ktx_uint32_t> qualityLevel{ktxAstcParams::qualityLevel, 0, KTX_PACK_ASTC_QUALITY_LEVEL_MAX};
@@ -902,6 +907,12 @@ void CommandCreate::processOptions(cxxopts::Options& opts, cxxopts::ParseResult&
                 options.inputFilepaths.size(), expectedInputImages);
     }
 
+    if (!isFormatAstc(options.vkFormat)) {
+        for (const char* astcOption : OptionsASTC::kAstcOptions)
+            if (args[astcOption].count())
+                fatal_usage("--{} can only be used with ASTC formats.", astcOption);
+    }
+
     if (options.codec == EncodeCodec::BasisLZ) {
         if (options.zstd.has_value())
             fatal_usage("Cannot encode to BasisLZ and supercompress with Zstd.");
+5 −2		clitests/CMakeLists.txt
+1 −0		clitests/golden/create/cli_errors/non_astc_fmt_astc_opts1.err.txt
+1 −0		clitests/golden/create/cli_errors/non_astc_fmt_astc_opts2.err.txt
+1 −0		clitests/golden/create/cli_errors/non_astc_fmt_astc_opts3.err.txt
+5 −1		clitests/tests/create/cli_errors.json