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

texconv -swizzle updated to also take 0, 1

Browse Source
This commit is contained in:
Chuck Walbourn 2021-02-24 00:50:37 -08:00
parent 610bbbd84e
commit 21202f09dc
1 changed files with 58 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Texconv/texconv.cpp
View File

@ -1061,15 +1061,19 @@ namespace
return normalizedLinear;
}
bool ParseSwizzleMask(_In_reads_(4) const wchar_t* mask, _Out_writes_(4) uint32_t* swizzleElements)
bool ParseSwizzleMask(
_In_reads_(4) const wchar_t* mask,
_Out_writes_(4) uint32_t* swizzleElements,
_Out_writes_(4) uint32_t* zeroElements,
_Out_writes_(4) uint32_t* oneElements)
{
if (!mask || !swizzleElements)
if (!mask || !swizzleElements || !zeroElements || !oneElements)
return false;
if (!mask[0])
return false;
for (size_t j = 0; j < 4; ++j)
for (uint32_t j = 0; j < 4; ++j)
{
if (!mask[j])
break;
@ -1080,24 +1084,36 @@ namespace
case L'X':
case L'r':
case L'x':
for (size_t k = j; k < 4; ++k)
for (uint32_t k = j; k < 4; ++k)
{
swizzleElements[k] = 0;
zeroElements[k] = 0;
oneElements[k] = 0;
}
break;
case L'G':
case L'Y':
case L'g':
case L'y':
for (size_t k = j; k < 4; ++k)
for (uint32_t k = j; k < 4; ++k)
{
swizzleElements[k] = 1;
zeroElements[k] = 0;
oneElements[k] = 0;
}
break;
case L'B':
case L'Z':
case L'b':
case L'z':
for (size_t k = j; k < 4; ++k)
for (uint32_t k = j; k < 4; ++k)
{
swizzleElements[k] = 2;
zeroElements[k] = 0;
oneElements[k] = 0;
}
break;
case L'A':
@ -1105,7 +1121,29 @@ namespace
case L'a':
case L'w':
for (size_t k = j; k < 4; ++k)
{
swizzleElements[k] = 3;
zeroElements[k] = 0;
oneElements[k] = 0;
}
break;
case L'0':
for (uint32_t k = j; k < 4; ++k)
{
swizzleElements[k] = k;
zeroElements[k] = 1;
oneElements[k] = 0;
}
break;
case L'1':
for (uint32_t k = j; k < 4; ++k)
{
swizzleElements[k] = k;
zeroElements[k] = 0;
oneElements[k] = 1;
}
break;
default:
@ -1150,6 +1188,8 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
float preserveAlphaCoverageRef = 0.0f;
bool keepRecursiveDirs = false;
uint32_t swizzleElements[4] = { 0, 1, 2, 3 };
uint32_t zeroElements[4] = {};
uint32_t oneElements[4] = {};
wchar_t szPrefix[MAX_PATH] = {};
wchar_t szSuffix[MAX_PATH] = {};
@ -1701,9 +1741,9 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
PrintUsage();
return 1;
}
else if (!ParseSwizzleMask(pValue, swizzleElements))
else if (!ParseSwizzleMask(pValue, swizzleElements, zeroElements, oneElements))
{
wprintf(L"-swizzle requires a 1 to 4 character mask composed of these letters: r, g, b, a, x, y, w, z\n");
wprintf(L"-swizzle requires a 1 to 4 character mask composed of these letters: r, g, b, a, x, y, w, z, 0, 1\n");
return 1;
}
break;
@ -2232,7 +2272,9 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
}
// --- Swizzle (if requested) --------------------------------------------------
if (swizzleElements[0] != 0 || swizzleElements[1] != 1 || swizzleElements[2] != 2 || swizzleElements[3] != 3)
if (swizzleElements[0] != 0 || swizzleElements[1] != 1 || swizzleElements[2] != 2 || swizzleElements[3] != 3
|| zeroElements[0] != 0 || zeroElements[1] != 0 || zeroElements[2] != 0 || zeroElements[3] != 0
|| oneElements[0] != 0 || oneElements[1] != 0 || oneElements[2] != 0 || oneElements[3] != 0)
{
std::unique_ptr<ScratchImage> timage(new (std::nothrow) ScratchImage);
if (!timage)
@ -2241,14 +2283,19 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
return 1;
}
XMVECTOR zc = XMVectorSelectControl(zeroElements[0], zeroElements[1], zeroElements[2], zeroElements[3]);
XMVECTOR oc = XMVectorSelectControl(oneElements[0], oneElements[1], oneElements[2], oneElements[3]);
hr = TransformImage(image->GetImages(), image->GetImageCount(), image->GetMetadata(),
[&](XMVECTOR* outPixels, const XMVECTOR* inPixels, size_t w, size_t y)
[&, zc, oc](XMVECTOR* outPixels, const XMVECTOR* inPixels, size_t w, size_t y)
{
UNREFERENCED_PARAMETER(y);
for (size_t j = 0; j < w; ++j)
{
outPixels[j] = XMVectorSwizzle(inPixels[j],
XMVECTOR pixel = XMVectorSelect(inPixels[j], g_XMZero, zc);
pixel = XMVectorSelect(pixel, g_XMOne, oc);
outPixels[j] = XMVectorSwizzle(pixel,
swizzleElements[0], swizzleElements[1], swizzleElements[2], swizzleElements[3]);
}
}, *timage);