Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-13 13:40:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

texconv: inverty switch

Browse Source
This commit is contained in:
Chuck Walbourn 2019-01-18 14:20:32 -08:00
parent e27d254119
commit a79989a4f0
1 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Texconv/texconv.cpp
View File

@ -101,6 +101,7 @@ enum OPTIONS
OPT_COLORKEY, OPT_COLORKEY,
OPT_TONEMAP, OPT_TONEMAP,
OPT_X2_BIAS, OPT_X2_BIAS,
OPT_INVERT_Y,
OPT_FILELIST, OPT_FILELIST,
OPT_ROTATE_COLOR, OPT_ROTATE_COLOR,
OPT_PAPER_WHITE_NITS, OPT_PAPER_WHITE_NITS,
@ -186,6 +187,7 @@ const SValue g_pOptions[] =
{ L"c", OPT_COLORKEY }, { L"c", OPT_COLORKEY },
{ L"tonemap", OPT_TONEMAP }, { L"tonemap", OPT_TONEMAP },
{ L"x2bias", OPT_X2_BIAS }, { L"x2bias", OPT_X2_BIAS },
{ L"inverty", OPT_INVERT_Y },
{ L"flist", OPT_FILELIST }, { L"flist", OPT_FILELIST },
{ L"rotatecolor", OPT_ROTATE_COLOR }, { L"rotatecolor", OPT_ROTATE_COLOR },
{ L"nits", OPT_PAPER_WHITE_NITS }, { L"nits", OPT_PAPER_WHITE_NITS },
@ -749,6 +751,7 @@ namespace
wprintf(L" -nits <value> paper-white value in nits to use for HDR10 (def: 200.0)\n"); wprintf(L" -nits <value> paper-white value in nits to use for HDR10 (def: 200.0)\n");
wprintf(L" -tonemap Apply a tonemap operator based on maximum luminance\n"); wprintf(L" -tonemap Apply a tonemap operator based on maximum luminance\n");
wprintf(L" -x2bias Enable *2 - 1 conversion cases for unorm/pos-only-float\n"); wprintf(L" -x2bias Enable *2 - 1 conversion cases for unorm/pos-only-float\n");
wprintf(L" -inverty Invert Y (i.e. green) channel values\n");
wprintf(L" -flist <filename> use text file with a list of input files (one per line)\n"); wprintf(L" -flist <filename> use text file with a list of input files (one per line)\n");
wprintf(L"\n <format>: "); wprintf(L"\n <format>: ");
@ -2475,6 +2478,54 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
cimage.reset(); cimage.reset();
} }
// --- Invert Y Channel --------------------------------------------------------
if (dwOptions & (DWORD64(1) << OPT_INVERT_Y))
{
std::unique_ptr<ScratchImage> timage(new (std::nothrow) ScratchImage);
if (!timage)
{
wprintf(L"\nERROR: Memory allocation failed\n");
return 1;
}
hr = TransformImage(image->GetImages(), image->GetImageCount(), image->GetMetadata(),
[&](XMVECTOR* outPixels, const XMVECTOR* inPixels, size_t width, size_t y)
{
static const XMVECTORU32 s_selecty = { { { XM_SELECT_0, XM_SELECT_1, XM_SELECT_0, XM_SELECT_0 } } };
UNREFERENCED_PARAMETER(y);
for (size_t j = 0; j < width; ++j)
{
XMVECTOR value = inPixels[j];
XMVECTOR inverty = XMVectorSubtract(g_XMOne, value);
outPixels[j] = XMVectorSelect(value, inverty, s_selecty);
}
}, *timage);
if (FAILED(hr))
{
wprintf(L" FAILED [inverty] (%x)\n", hr);
return 1;
}
auto& tinfo = timage->GetMetadata();
tinfo;
assert(info.width == tinfo.width);
assert(info.height == tinfo.height);
assert(info.depth == tinfo.depth);
assert(info.arraySize == tinfo.arraySize);
assert(info.mipLevels == tinfo.mipLevels);
assert(info.miscFlags == tinfo.miscFlags);
assert(info.format == tinfo.format);
assert(info.dimension == tinfo.dimension);
image.swap(timage);
cimage.reset();
}
// --- Generate mips ----------------------------------------------------------- // --- Generate mips -----------------------------------------------------------
DWORD dwFilter3D = dwFilter; DWORD dwFilter3D = dwFilter;
if (!ispow2(info.width) || !ispow2(info.height) || !ispow2(info.depth)) if (!ispow2(info.width) || !ispow2(info.height) || !ispow2(info.depth))