Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-07 05:26:12 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

DirectXTex: added alpha weight parameter for BC7 GPU compressor [breaking change]

Browse Source 
- texconv has new '-aw' switch to take the parameter
This commit is contained in:
walbourn_cp
2014-02-19 17:31:35 -08:00
parent 5336f904da
commit 76b79c42b5
5 changed files with 92 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Texconv/texconv.cpp
View File

@@ -46,6 +46,7 @@ enum OPTIONS // Note: dwOptions below assumes 32 or less options.
OPT_NOGPU,
OPT_FEATURE_LEVEL,
OPT_FIT_POWEROF2,
OPT_ALPHA_WEIGHT,
OPT_MAX
};
@@ -99,6 +100,7 @@ SValue g_pOptions[] =
{ L"nogpu", OPT_NOGPU },
{ L"fl", OPT_FEATURE_LEVEL },
{ L"pow2", OPT_FIT_POWEROF2 },
{ L"aw", OPT_ALPHA_WEIGHT },
{ nullptr, 0 }
};
@@ -393,6 +395,8 @@ void PrintUsage()
wprintf( L" -wrap, -mirror texture addressing mode (wrap, mirror, or clamp)\n");
wprintf( L" -pmalpha convert final texture to use premultiplied alpha\n");
wprintf( L" -pow2 resize to fit a power-of-2, respecting aspect ratio\n" );
wprintf( L" -aw BC7 GPU compressor weighting for alpha error metric\n"
L" (defaults to 1.0)\n" );
wprintf( L" -fl <feature-level> Set maximum feature level target (defaults to 11.0)\n");
wprintf( L"\n (DDS input only)\n");
wprintf( L" -t{u|f} TYPELESS format is treated as UNORM or FLOAT\n");
@@ -570,6 +574,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
DWORD dwFilterOpts = 0;
DWORD FileType = CODEC_DDS;
DWORD maxSize = 16384;
float alphaWeight = 1.f;
WCHAR szPrefix [MAX_PATH];
WCHAR szSuffix [MAX_PATH];
@@ -759,6 +764,22 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
return 1;
}
break;
case OPT_ALPHA_WEIGHT:
if (swscanf_s(pValue, L"%f", &alphaWeight) != 1)
{
wprintf( L"Invalid value specified with -aw (%s)\n", pValue);
printf("\n");
PrintUsage();
return 1;
}
else if ( alphaWeight < 0.f )
{
wprintf( L"-aw (%s) parameter must be positive\n", pValue);
printf("\n");
return 1;
}
break;
}
}
else
@@ -1388,7 +1409,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if ( bc6hbc7 && pDevice )
{
hr = Compress( pDevice, img, nimg, info, tformat, dwSRGB, *timage );
hr = Compress( pDevice, img, nimg, info, tformat, dwSRGB, alphaWeight, *timage );
}
else
{