From c825869b65b40ddeb2044ab7f3520970c880ce28 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 20 Sep 2016 16:59:15 -0700 Subject: [PATCH] texconv: -bcmax and -bcquick are mutually exclusive switches --- Texconv/texconv.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp index 898bbd0..d1f5914 100644 --- a/Texconv/texconv.cpp +++ b/Texconv/texconv.cpp @@ -1204,10 +1204,22 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) break; case OPT_COMPRESS_MAX: + if (dwCompress & TEX_COMPRESS_BC7_QUICK) + { + wprintf(L"Can't use -bcmax and -bcquick at same time\n\n"); + PrintUsage(); + return 1; + } dwCompress |= TEX_COMPRESS_BC7_USE_3SUBSETS; break; case OPT_COMPRESS_QUICK: + if (dwCompress & TEX_COMPRESS_BC7_USE_3SUBSETS) + { + wprintf(L"Can't use -bcmax and -bcquick at same time\n\n"); + PrintUsage(); + return 1; + } dwCompress |= TEX_COMPRESS_BC7_QUICK; break;