Skip to content

Commit 004568e

Browse files
committed
keep all existing switches to avoid breaking changes
1 parent 898dc8e commit 004568e

File tree

1 file changed

+19
-26
lines changed

1 file changed

+19
-26
lines changed

Texconv/texconv.cpp

+19-26
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,25 @@ namespace
241241
{ L"xbox", OPT_USE_XBOX },
242242
{ L"xgmode", OPT_XGMODE },
243243
#endif
244+
245+
// Deprecated options (recommend using new -- alternatives)
246+
{ L"badtails", OPT_DDS_BAD_DXTN_TAILS },
247+
{ L"permissive", OPT_DDS_PERMISSIVE },
248+
{ L"ignoremips", OPT_DDS_IGNORE_MIPS },
249+
{ L"tgazeroalpha", OPT_TGAZEROALPHA },
250+
{ L"wiclossless", OPT_WIC_LOSSLESS },
251+
{ L"wicmulti", OPT_WIC_MULTIFRAME },
252+
{ L"timing", OPT_TIMING },
253+
{ L"keepcoverage", OPT_PRESERVE_ALPHA_COVERAGE },
254+
{ L"singleproc", OPT_FORCE_SINGLEPROC },
255+
{ L"tonemap", OPT_TONEMAP },
256+
{ L"x2bias", OPT_X2_BIAS },
257+
{ L"inverty", OPT_INVERT_Y },
258+
{ L"reconstructz", OPT_RECONSTRUCT_Z },
259+
{ L"rotatecolor", OPT_ROTATE_COLOR },
260+
{ L"fixbc4x4", OPT_BCNONMULT4FIX },
261+
{ L"swizzle", OPT_SWIZZLE },
262+
244263
{ nullptr, 0 }
245264
};
246265

@@ -301,23 +320,6 @@ namespace
301320
{ nullptr, 0 }
302321
};
303322

304-
const SValue<const wchar_t*> g_pOptionsOld[] =
305-
{
306-
{ L"badtails", L"bad-tails" },
307-
{ L"fixbc4x4", L"fix-bc-4x4" },
308-
{ L"ignoremips", L"ignore-mips" },
309-
{ L"inverty", L"invert-y" },
310-
{ L"keepcoverage", L"keep-coverage" },
311-
{ L"reconstructz", L"reconstruct-z" },
312-
{ L"rotatecolor", L"rotate-color" },
313-
{ L"singleproc", L"single-proc" },
314-
{ L"tgazeroalpha", L"tga-zero-alpha" },
315-
{ L"wiclossless", L"wic-lossless" },
316-
{ L"wicmulti", L"wic-multiframe" },
317-
{ L"x2bias", L"x2-bias" },
318-
{ nullptr, nullptr }
319-
};
320-
321323
#define DEFFMT(fmt) { L## #fmt, DXGI_FORMAT_ ## fmt }
322324

323325
const SValue<DXGI_FORMAT> g_pFormats[] =
@@ -1344,15 +1346,6 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
13441346
wprintf(L"ERROR: did you mean `--%ls` (with two dashes)?\n", pArg);
13451347
return 1;
13461348
}
1347-
else
1348-
{
1349-
auto hint = LookupByName(pArg, g_pOptionsOld);
1350-
if (hint)
1351-
{
1352-
wprintf(L"ERROR: use `--%ls` (with two dashes) instead\n", hint);
1353-
return 1;
1354-
}
1355-
}
13561349
}
13571350
}
13581351

0 commit comments

Comments
 (0)