Skip to content

Commit

Permalink
Resolve PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Mátyás Császár committed Jul 7, 2023
1 parent 722b226 commit 93b77d2
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 14 deletions.
2 changes: 1 addition & 1 deletion tests/cts
Submodule cts updated 9 files
+1 −1 clitests/golden/create/cli_errors/inconsistent_colorspaces.err.txt
+1 −1 clitests/golden/create/colorspaces_error/png_transfer_mismatch_gamma_1_0.err.txt
+1 −1 clitests/golden/create/colorspaces_error/png_transfer_mismatch_gamma_1_8.err.txt
+1 −1 clitests/golden/create/colorspaces_error/png_transfer_mismatch_gamma_2_2.err.txt
+1 −1 clitests/golden/create/colorspaces_error/png_transfer_mismatch_gamma_2_4.err.txt
+1 −1 clitests/golden/create/colorspaces_warning/exr_primaries_mismatch_assign.err.txt
+1 −1 clitests/golden/create/colorspaces_warning/png_primaries_mismatch_assign.err.txt
+2 −2 clitests/golden/create/colorspaces_warning/png_transfer_mismatch_assign.err.txt
+15 −5 clitests/golden/create/help/help.out.txt
49 changes: 36 additions & 13 deletions tools/ktx/command_create.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,19 @@ struct OptionsCreate {
("format", "KTX format enum that specifies the image data format."
" The enum names are matching the VkFormats without the VK_FORMAT_ prefix."
" The VK_FORMAT_ prefix is ignored if present."
" If the --encode option is used it specifies the format created from the"
" the input files before the encoding step."
" If the format is an ASTC format the ASTC encoder specific options become valid,"
"\nWhen used with --encode it specifies the format of the input files before the encoding step."
" In this case it must be one of:"
"\n R8_UNORM"
"\n R8_SRGB"
"\n R8G8_UNORM"
"\n R8G8_SRGB"
"\n R8G8B8_UNORM"
"\n R8G8B8_SRGB"
"\n R8G8B8A8_UNORM"
"\n R8G8B8A8_SRGB"
"\nIf the format is an ASTC format the ASTC encoder specific options become valid,"
" otherwise they are ignored."
"\nThe format will be used to verify and load all input files into a texture before encoding."
" Case insensitive. Required.", cxxopts::value<std::string>(), "<enum>")
("1d", "Create a 1D texture. If not set the texture will be a 2D or 3D texture.")
("cubemap", "Create a cubemap texture. If not set the texture will be a 2D or 3D texture.")
Expand Down Expand Up @@ -623,11 +632,22 @@ Create a KTX2 file from various input files.
<dt>--format &lt;enum&gt;</dt>
<dd>KTX format enum that specifies the image data format.
The enum names are matching the VkFormats without the VK_FORMAT_ prefix.
The VK_FORMAT_ prefix is ignored if present.
If the --encode option is used it specifies the format created from the
the input files before the encoding step.
The VK_FORMAT_ prefix is ignored if present.<br />
When used with --encode it specifies the format of the input files before the encoding step.
In this case it must be one of:
<ul>
<li>R8_UNORM</li>
<li>R8_SRGB</li>
<li>R8G8_UNORM</li>
<li>R8G8_SRGB</li>
<li>R8G8B8_UNORM</li>
<li>R8G8B8_SRGB</li>
<li>R8G8B8A8_UNORM</li>
<li>R8G8B8A8_SRGB</li>
</ul>
If the format is an ASTC format the ASTC encoder specific options become valid,
otherwise they are ignored.
otherwise they are ignored.<br />
The format will be used to verify and load all input files into a texture before encoding.<br />
Case insensitive. Required.</dd>
<dl>
<dt>--astc-mode &lt;ldr | hdr&gt;</dt>
Expand Down Expand Up @@ -2129,15 +2149,16 @@ void CommandCreate::checkSpecsMatch(const ImageInput& currentFile, const ImageSp
if (currentFormat.transfer() != firstFormat.transfer()) {
if (options.assignOETF.has_value()) {
warning("Input image \"{}\" has different transfer function ({}) than the first image ({})"
" but will be threaded identically as specified by the --assign-oetf option.",
" but will be treated identically as specified by the --assign-oetf option.",
currentFile.filename(), toString(currentFormat.transfer()), toString(firstFormat.transfer()));
} else if (options.convertOETF.has_value()) {
warning("Input image \"{}\" has different transfer function ({}) than the first image ({})"
" and thus will go through different transfer function conversion to the target transfer"
" function specified by the --convert-oetf option.",
currentFile.filename(), toString(currentFormat.transfer()), toString(firstFormat.transfer()));
} else {
fatal(rc::INVALID_FILE, "Input image \"{}\" has different transfer function ({}) than the first image ({}).",
fatal(rc::INVALID_FILE, "Input image \"{}\" has different transfer function ({}) than the first image ({})."
" Use --assign-oetf or --convert-oetf to specify handling and stop this error.",
currentFile.filename(), toString(currentFormat.transfer()), toString(firstFormat.transfer()));
}
}
Expand All @@ -2147,31 +2168,33 @@ void CommandCreate::checkSpecsMatch(const ImageInput& currentFile, const ImageSp
auto firstGamma = firstFormat.oeGamma() != -1 ? std::to_string(firstFormat.oeGamma()) : "no gamma";
if (options.assignOETF.has_value()) {
warning("Input image \"{}\" has different gamma ({}) than the first image ({})"
" but will be threaded identically as specified by the --assign-oetf option.",
" but will be treated identically as specified by the --assign-oetf option.",
currentFile.filename(), currentGamma, firstGamma);
} else if (options.convertOETF.has_value()) {
warning("Input image \"{}\" has different gamma ({}) than the first image ({})"
" and thus will go through different transfer function conversion to the target transfer"
" function specified by the --convert-oetf option.",
currentFile.filename(), currentGamma, firstGamma);
} else {
fatal(rc::INVALID_FILE, "Input image \"{}\" has different gamma ({}) than the first image ({}).",
fatal(rc::INVALID_FILE, "Input image \"{}\" has different gamma ({}) than the first image ({})."
" Use --assign-oetf or --convert-oetf to specify handling and stop this error.",
currentFile.filename(), currentGamma, firstGamma);
}
}

if (currentFormat.primaries() != firstFormat.primaries()) {
if (options.assignPrimaries.has_value()) {
warning("Input image \"{}\" has different primaries ({}) than the first image ({})"
" but will be threaded identically as specified by the --assign-primaries option.",
" but will be treated identically as specified by the --assign-primaries option.",
currentFile.filename(), toString(currentFormat.primaries()), toString(firstFormat.primaries()));
} else if (options.convertPrimaries.has_value()) {
warning("Input image \"{}\" has different primaries ({}) than the first image ({})"
" and thus will go through different primaries conversion to the target primaries"
" specified by the --convert-primaries option.",
currentFile.filename(), toString(currentFormat.primaries()), toString(firstFormat.primaries()));
} else {
fatal(rc::INVALID_FILE, "Input image \"{}\" has different primaries ({}) than the first image ({}).",
fatal(rc::INVALID_FILE, "Input image \"{}\" has different primaries ({}) than the first image ({})."
" Use --assign-primaries or --convert-primaries to specify handling and stop this error.",
currentFile.filename(), toString(currentFormat.primaries()), toString(firstFormat.primaries()));
}
}
Expand Down

0 comments on commit 93b77d2

Please sign in to comment.