From e62bbb24f8dcadf127a59e6036d9cf78c276a1e1 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 1 May 2018 17:34:54 -0700 Subject: [PATCH] Retire Windows 8.1 Store, Windows phone 8.1. and VS 2013 projects (#96) * Retire VS 2013 projects * Cleaned up warning suppression * Use ``noexcept`` instead of ``throw()`` * Can use ``%zu`` instead of ``%Iu`` * More uniform initialization --- DDSView/DDSView_Desktop_2013.vcxproj | 408 ----------- DDSView/DDSView_Desktop_2013.vcxproj.filters | 20 - DDSView/ddsview.cpp | 2 +- DirectXTex/BC.cpp | 17 +- DirectXTex/BC6HBC7.cpp | 7 +- DirectXTex/BCDirectCompute.cpp | 2 +- DirectXTex/BCDirectCompute.h | 2 +- DirectXTex/DirectXTex.h | 12 +- DirectXTex/DirectXTexConvert.cpp | 2 +- DirectXTex/DirectXTexImage.cpp | 2 +- DirectXTex/DirectXTexP.h | 11 +- DirectXTex/DirectXTexUtil.cpp | 4 +- DirectXTex/DirectXTex_Desktop_2013.vcxproj | 457 ------------ .../DirectXTex_Desktop_2013.vcxproj.filters | 163 ----- DirectXTex/DirectXTex_Windows81.vcxproj | 676 ------------------ .../DirectXTex_Windows81.vcxproj.filters | 163 ----- DirectXTex/DirectXTex_WindowsPhone81.vcxproj | 220 ------ .../DirectXTex_WindowsPhone81.vcxproj.filters | 161 ----- DirectXTex/Filters.h | 2 +- DirectXTex_Desktop_2013.sln | 99 --- DirectXTex_Windows81.sln | 43 -- DirectXTex_WindowsPhone81.sln | 28 - ReadMe.txt | 6 +- Texassemble/Texassemble_Desktop_2013.vcxproj | 407 ----------- .../Texassemble_Desktop_2013.vcxproj.filters | 17 - Texassemble/texassemble.cpp | 12 +- Texconv/Texconv_Desktop_2013.vcxproj | 407 ----------- Texconv/Texconv_Desktop_2013.vcxproj.filters | 17 - Texconv/texconv.cpp | 14 +- Texdiag/texdiag.cpp | 48 +- Texdiag/texdiag_Desktop_2013.vcxproj | 407 ----------- Texdiag/texdiag_Desktop_2013.vcxproj.filters | 17 - 32 files changed, 64 insertions(+), 3789 deletions(-) delete mode 100644 DDSView/DDSView_Desktop_2013.vcxproj delete mode 100644 DDSView/DDSView_Desktop_2013.vcxproj.filters delete mode 100644 DirectXTex/DirectXTex_Desktop_2013.vcxproj delete mode 100644 DirectXTex/DirectXTex_Desktop_2013.vcxproj.filters delete mode 100644 DirectXTex/DirectXTex_Windows81.vcxproj delete mode 100644 DirectXTex/DirectXTex_Windows81.vcxproj.filters delete mode 100644 DirectXTex/DirectXTex_WindowsPhone81.vcxproj delete mode 100644 DirectXTex/DirectXTex_WindowsPhone81.vcxproj.filters delete mode 100644 DirectXTex_Desktop_2013.sln delete mode 100644 DirectXTex_Windows81.sln delete mode 100644 DirectXTex_WindowsPhone81.sln delete mode 100644 Texassemble/Texassemble_Desktop_2013.vcxproj delete mode 100644 Texassemble/Texassemble_Desktop_2013.vcxproj.filters delete mode 100644 Texconv/Texconv_Desktop_2013.vcxproj delete mode 100644 Texconv/Texconv_Desktop_2013.vcxproj.filters delete mode 100644 Texdiag/texdiag_Desktop_2013.vcxproj delete mode 100644 Texdiag/texdiag_Desktop_2013.vcxproj.filters diff --git a/DDSView/DDSView_Desktop_2013.vcxproj b/DDSView/DDSView_Desktop_2013.vcxproj deleted file mode 100644 index 9e2aba3..0000000 --- a/DDSView/DDSView_Desktop_2013.vcxproj +++ /dev/null @@ -1,408 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Profile - Win32 - - - Profile - x64 - - - Release - Win32 - - - Release - x64 - - - - DDSView - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84} - DDSView - Win32Proj - $(VCTargetsPath11) - - - - Application - Unicode - v120 - - - Application - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - DDSView - true - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - DDSView - true - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - DDSView - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - DDSView - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - DDSView - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - DDSView - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - - Level4 - Disabled - MultiThreadedDebugDLL - false - true - Fast - StreamingSIMDExtensions2 - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - EditAndContinue - EnableFastChecks - - - %(AdditionalOptions) - d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - Windows - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - Disabled - MultiThreadedDebugDLL - false - true - Fast - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - EnableFastChecks - - - %(AdditionalOptions) - d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - Windows - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - StreamingSIMDExtensions2 - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - StreamingSIMDExtensions2 - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - - - - - - - {371b9fa9-4c90-4ac6-a123-aced756d6c77} - - - - - - - - \ No newline at end of file diff --git a/DDSView/DDSView_Desktop_2013.vcxproj.filters b/DDSView/DDSView_Desktop_2013.vcxproj.filters deleted file mode 100644 index ab6eee7..0000000 --- a/DDSView/DDSView_Desktop_2013.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {8e114980-c1a3-4ada-ad7c-83caadf5daeb} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - - - - Resource Files - - - - - - \ No newline at end of file diff --git a/DDSView/ddsview.cpp b/DDSView/ddsview.cpp index 8eaa3c4..448b5d7 100644 --- a/DDSView/ddsview.cpp +++ b/DDSView/ddsview.cpp @@ -138,7 +138,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, if ( mdata.arraySize > 1 ) { wchar_t buff[2048] = {}; - swprintf_s( buff, L"Arrays of volume textures are not supported\n\nFilename = %ls\nArray size %Iu", lpCmdLine, mdata.arraySize ); + swprintf_s( buff, L"Arrays of volume textures are not supported\n\nFilename = %ls\nArray size %zu", lpCmdLine, mdata.arraySize ); MessageBox( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); return 0; } diff --git a/DirectXTex/BC.cpp b/DirectXTex/BC.cpp index 5939b99..f21fbd8 100644 --- a/DirectXTex/BC.cpp +++ b/DirectXTex/BC.cpp @@ -739,8 +739,7 @@ void DirectX::D3DXEncodeBC1(uint8_t *pBC, const XMVECTOR *pColor, float threshol if (flags & BC_FLAGS_DITHER_A) { - float fError[NUM_PIXELS_PER_BLOCK]; - memset(fError, 0x00, NUM_PIXELS_PER_BLOCK * sizeof(float)); + float fError[NUM_PIXELS_PER_BLOCK] = {}; for (size_t i = 0; i < NUM_PIXELS_PER_BLOCK; ++i) { @@ -839,10 +838,7 @@ void DirectX::D3DXEncodeBC2(uint8_t *pBC, const XMVECTOR *pColor, DWORD flags) pBC2->bitmap[0] = 0; pBC2->bitmap[1] = 0; - float fError[NUM_PIXELS_PER_BLOCK]; - if (flags & BC_FLAGS_DITHER_A) - memset(fError, 0x00, NUM_PIXELS_PER_BLOCK * sizeof(float)); - + float fError[NUM_PIXELS_PER_BLOCK] = {}; for (size_t i = 0; i < NUM_PIXELS_PER_BLOCK; ++i) { float fAlph = Color[i].a; @@ -957,15 +953,12 @@ void DirectX::D3DXEncodeBC3(uint8_t *pBC, const XMVECTOR *pColor, DWORD flags) // Quantize block to A8, using Floyd Stienberg error diffusion. This // increases the chance that colors will map directly to the quantized // axis endpoints. - float fAlpha[NUM_PIXELS_PER_BLOCK]; - float fError[NUM_PIXELS_PER_BLOCK]; + float fAlpha[NUM_PIXELS_PER_BLOCK] = {}; + float fError[NUM_PIXELS_PER_BLOCK] = {}; float fMinAlpha = Color[0].a; float fMaxAlpha = Color[0].a; - if (flags & BC_FLAGS_DITHER_A) - memset(fError, 0x00, NUM_PIXELS_PER_BLOCK * sizeof(float)); - for (size_t i = 0; i < NUM_PIXELS_PER_BLOCK; ++i) { float fAlph = Color[i].a; @@ -1054,7 +1047,7 @@ void DirectX::D3DXEncodeBC3(uint8_t *pBC, const XMVECTOR *pColor, DWORD flags) static const size_t pSteps8[] = { 0, 2, 3, 4, 5, 6, 7, 1 }; const size_t *pSteps; - float fStep[8]; + float fStep[8] = {}; if (6 == uSteps) { diff --git a/DirectXTex/BC6HBC7.cpp b/DirectXTex/BC6HBC7.cpp index 27ab6cd..c2cc9bb 100644 --- a/DirectXTex/BC6HBC7.cpp +++ b/DirectXTex/BC6HBC7.cpp @@ -715,7 +715,7 @@ namespace INTColor aIPixels[NUM_PIXELS_PER_BLOCK]; EncodeParams(const HDRColorA* const aOriginal, bool bSignedFormat) : - fBestErr(FLT_MAX), bSigned(bSignedFormat), aHDRPixels(aOriginal) + fBestErr(FLT_MAX), bSigned(bSignedFormat), uMode(0), uShape(0), aHDRPixels(aOriginal), aUnqEndPts{}, aIPixels{} { for (size_t i = 0; i < NUM_PIXELS_PER_BLOCK; ++i) { @@ -791,7 +791,7 @@ namespace LDRColorA aLDRPixels[NUM_PIXELS_PER_BLOCK]; const HDRColorA* const aHDRPixels; - EncodeParams(const HDRColorA* const aOriginal) : aHDRPixels(aOriginal) {} + EncodeParams(const HDRColorA* const aOriginal) : uMode(0), aEndPts{}, aLDRPixels{}, aHDRPixels(aOriginal) {} }; #pragma warning(pop) @@ -1671,8 +1671,7 @@ void D3DX_BC6H::Decode(bool bSigned, HDRColorA* pOut) const _Analysis_assume_(ms_aModeToInfo[uMode] < ARRAYSIZE(ms_aDesc)); const ModeInfo& info = ms_aInfo[ms_aModeToInfo[uMode]]; - INTEndPntPair aEndPts[BC6H_MAX_REGIONS]; - memset(aEndPts, 0, BC6H_MAX_REGIONS * 2 * sizeof(INTColor)); + INTEndPntPair aEndPts[BC6H_MAX_REGIONS] = {}; uint32_t uShape = 0; // Read header diff --git a/DirectXTex/BCDirectCompute.cpp b/DirectXTex/BCDirectCompute.cpp index 3f8713f..3e0d0fb 100644 --- a/DirectXTex/BCDirectCompute.cpp +++ b/DirectXTex/BCDirectCompute.cpp @@ -79,7 +79,7 @@ namespace } }; -GPUCompressBC::GPUCompressBC() throw() : +GPUCompressBC::GPUCompressBC() noexcept : m_bcformat(DXGI_FORMAT_UNKNOWN), m_srcformat(DXGI_FORMAT_UNKNOWN), m_alphaWeight(1.f), diff --git a/DirectXTex/BCDirectCompute.h b/DirectXTex/BCDirectCompute.h index 9a4a6ff..f231c07 100644 --- a/DirectXTex/BCDirectCompute.h +++ b/DirectXTex/BCDirectCompute.h @@ -15,7 +15,7 @@ namespace DirectX class GPUCompressBC { public: - GPUCompressBC() throw(); + GPUCompressBC() noexcept; HRESULT Initialize(_In_ ID3D11Device* pDevice); diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h index 52894e3..4b411fe 100644 --- a/DirectXTex/DirectXTex.h +++ b/DirectXTex/DirectXTex.h @@ -257,13 +257,13 @@ namespace DirectX class ScratchImage { public: - ScratchImage() throw() + ScratchImage() noexcept : m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr) {} - ScratchImage(ScratchImage&& moveFrom) throw() + ScratchImage(ScratchImage&& moveFrom) noexcept : m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr) { *this = std::move(moveFrom); } ~ScratchImage() { Release(); } - ScratchImage& __cdecl operator= (ScratchImage&& moveFrom) throw(); + ScratchImage& __cdecl operator= (ScratchImage&& moveFrom) noexcept; ScratchImage(const ScratchImage&) = delete; ScratchImage& operator=(const ScratchImage&) = delete; @@ -308,11 +308,11 @@ namespace DirectX class Blob { public: - Blob() throw() : m_buffer(nullptr), m_size(0) {} - Blob(Blob&& moveFrom) throw() : m_buffer(nullptr), m_size(0) { *this = std::move(moveFrom); } + Blob() noexcept : m_buffer(nullptr), m_size(0) {} + Blob(Blob&& moveFrom) noexcept : m_buffer(nullptr), m_size(0) { *this = std::move(moveFrom); } ~Blob() { Release(); } - Blob& __cdecl operator= (Blob&& moveFrom) throw(); + Blob& __cdecl operator= (Blob&& moveFrom) noexcept; Blob(const Blob&) = delete; Blob& operator=(const Blob&) = delete; diff --git a/DirectXTex/DirectXTexConvert.cpp b/DirectXTex/DirectXTexConvert.cpp index 180efa8..c8d4b09 100644 --- a/DirectXTex/DirectXTexConvert.cpp +++ b/DirectXTex/DirectXTexConvert.cpp @@ -2882,7 +2882,7 @@ namespace }; #pragma prefast( suppress : 25004, "Signature must match bsearch_s" ); - int __cdecl ConvertCompare(void *context, const void* ptr1, const void *ptr2) throw() + int __cdecl ConvertCompare(void *context, const void* ptr1, const void *ptr2) noexcept { UNREFERENCED_PARAMETER(context); auto p1 = static_cast(ptr1); diff --git a/DirectXTex/DirectXTexImage.cpp b/DirectXTex/DirectXTexImage.cpp index abc8590..d57d039 100644 --- a/DirectXTex/DirectXTexImage.cpp +++ b/DirectXTex/DirectXTexImage.cpp @@ -234,7 +234,7 @@ bool DirectX::_SetupImageArray( // ScratchImage - Bitmap image container //===================================================================================== -ScratchImage& ScratchImage::operator= (ScratchImage&& moveFrom) throw() +ScratchImage& ScratchImage::operator= (ScratchImage&& moveFrom) noexcept { if (this != &moveFrom) { diff --git a/DirectXTex/DirectXTexP.h b/DirectXTex/DirectXTexP.h index 47abf78..1b56570 100644 --- a/DirectXTex/DirectXTexP.h +++ b/DirectXTex/DirectXTexP.h @@ -11,16 +11,9 @@ #pragma once -// VS 2013 related Off by default warnings -#pragma warning(disable : 4619 4616 4350 4351 4472 4640) -// C4619/4616 #pragma warning warnings -// C4350 behavior change -// C4351 behavior change; warning removed in later versions -// C4472 'X' is a native enum: add an access specifier (private/public) to declare a WinRT enum -// C4640 construction of local static object is not thread-safe - // Off by default warnings -#pragma warning(disable : 4061 4265 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5039 5045) +#pragma warning(disable : 4619 4616 4061 4265 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5039 5045) +// C4619/4616 #pragma warning warnings // C4061 enumerator 'X' in switch of enum 'X' is not explicitly handled by a case label // C4265 class has virtual functions, but destructor is not virtual // C4365 signed/unsigned mismatch diff --git a/DirectXTex/DirectXTexUtil.cpp b/DirectXTex/DirectXTexUtil.cpp index b6ce004..d6f4c89 100644 --- a/DirectXTex/DirectXTexUtil.cpp +++ b/DirectXTex/DirectXTexUtil.cpp @@ -236,7 +236,7 @@ IWICImagingFactory* DirectX::GetWICFactory(bool& iswic2) static INIT_ONCE s_initOnce = INIT_ONCE_STATIC_INIT; InitOnceExecuteOnce(&s_initOnce, - [](PINIT_ONCE, PVOID, LPVOID *factory) throw() -> BOOL + [](PINIT_ONCE, PVOID, LPVOID *factory) noexcept -> BOOL { #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) HRESULT hr = CoCreateInstance( @@ -1413,7 +1413,7 @@ size_t TexMetadata::ComputeIndex(size_t mip, size_t item, size_t slice) const // Blob - Bitmap image container //===================================================================================== -Blob& Blob::operator= (Blob&& moveFrom) throw() +Blob& Blob::operator= (Blob&& moveFrom) noexcept { if (this != &moveFrom) { diff --git a/DirectXTex/DirectXTex_Desktop_2013.vcxproj b/DirectXTex/DirectXTex_Desktop_2013.vcxproj deleted file mode 100644 index 41f0be8..0000000 --- a/DirectXTex/DirectXTex_Desktop_2013.vcxproj +++ /dev/null @@ -1,457 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Profile - Win32 - - - Profile - x64 - - - Release - Win32 - - - Release - x64 - - - - DirectXTex - {371B9FA9-4C90-4AC6-A123-ACED756D6C77} - DirectXTex - Win32Proj - $(VCTargetsPath11) - - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - DirectXTex - true - true - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - DirectXTex - true - true - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - - EnableAllWarnings - Disabled - MultiThreadedDebugDLL - true - true - Fast - StreamingSIMDExtensions2 - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - EditAndContinue - EnableFastChecks - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - - - %(AdditionalOptions) - %(AdditionalDependencies) - Windows - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - EnableAllWarnings - Disabled - MultiThreadedDebugDLL - true - true - Fast - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - EnableFastChecks - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - - - %(AdditionalOptions) - %(AdditionalDependencies) - Windows - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - EnableAllWarnings - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - StreamingSIMDExtensions2 - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - - - %(AdditionalOptions) - %(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - EnableAllWarnings - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - - - %(AdditionalOptions) - %(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - EnableAllWarnings - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - StreamingSIMDExtensions2 - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - - - %(AdditionalOptions) - %(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - EnableAllWarnings - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - - - %(AdditionalOptions) - %(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Document - - - Document - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/DirectXTex/DirectXTex_Desktop_2013.vcxproj.filters b/DirectXTex/DirectXTex_Desktop_2013.vcxproj.filters deleted file mode 100644 index 1c9c27e..0000000 --- a/DirectXTex/DirectXTex_Desktop_2013.vcxproj.filters +++ /dev/null @@ -1,163 +0,0 @@ - - - - - {1b82e2dc-aea9-4897-8c7e-7ff2aa1ea8c8} - - - {d342dfd3-2538-4c06-98aa-9f8f79a9abee} - - - {1d9a21fa-9b40-40bd-a0d2-777ca8e2a4ca} - - - {30730940-319b-4b9d-bc3c-f4f00029cafb} - - - {ca7fdb2a-e99b-4b62-a803-629281c5ebe9} - - - - - Header Files - - - Header Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - - - Source Files\Shaders - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders - - - Source Files\Shaders - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - \ No newline at end of file diff --git a/DirectXTex/DirectXTex_Windows81.vcxproj b/DirectXTex/DirectXTex_Windows81.vcxproj deleted file mode 100644 index 9741a4f..0000000 --- a/DirectXTex/DirectXTex_Windows81.vcxproj +++ /dev/null @@ -1,676 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Profile - ARM - - - Profile - Win32 - - - Profile - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - DirectXTex - {371B9FA9-4C90-4AC6-A123-ACED756D6C77} - DirectXTex - Win32Proj - $(VCTargetsPath11) - en-US - 12.0 - true - Windows Store - 8.1 - - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - v120 - - - StaticLibrary - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bin\Windows81\$(Platform)\$(Configuration)\ - Bin\Windows81\$(Platform)\$(Configuration)\ - DirectXTex - true - true - - - Bin\Windows81\$(Platform)\$(Configuration)\ - Bin\Windows81\$(Platform)\$(Configuration)\ - DirectXTex - true - true - - - Bin\Windows81\$(Platform)\$(Configuration)\ - Bin\Windows81\$(Platform)\$(Configuration)\ - DirectXTex - true - true - - - Bin\Windows81\$(Platform)\$(Configuration)\ - Bin\Windows81\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - Bin\Windows81\$(Platform)\$(Configuration)\ - Bin\Windows81\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - Bin\Windows81\$(Platform)\$(Configuration)\ - Bin\Windows81\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - Bin\Windows81\$(Platform)\$(Configuration)\ - Bin\Windows81\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - Bin\Windows81\$(Platform)\$(Configuration)\ - Bin\Windows81\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - Bin\Windows81\$(Platform)\$(Configuration)\ - Bin\Windows81\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - - EnableAllWarnings - Disabled - MultiThreadedDebugDLL - true - true - Fast - StreamingSIMDExtensions2 - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - 4628 - - - %(AdditionalOptions) - %(AdditionalDependencies) - Windows - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - /IGNORE:4264 %(AdditionalOptions) - - - - - EnableAllWarnings - Disabled - MultiThreadedDebugDLL - true - true - Fast - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - 4628 - - - %(AdditionalOptions) - %(AdditionalDependencies) - Windows - true - true - true - true - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - /IGNORE:4264 %(AdditionalOptions) - - - - - EnableAllWarnings - Disabled - MultiThreadedDebugDLL - true - true - Fast - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - 4628 - - - %(AdditionalOptions) - %(AdditionalDependencies) - Windows - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - /IGNORE:4264 %(AdditionalOptions) - - - - - EnableAllWarnings - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - StreamingSIMDExtensions2 - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions) - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - 4628 - - - %(AdditionalOptions) - %(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - /IGNORE:4264 %(AdditionalOptions) - - - - - EnableAllWarnings - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions) - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - 4628 - - - %(AdditionalOptions) - %(AdditionalDependencies) - true - Windows - true - true - true - true - true - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - /IGNORE:4264 %(AdditionalOptions) - - - - - EnableAllWarnings - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions) - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - 4628 - - - %(AdditionalOptions) - %(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - /IGNORE:4264 %(AdditionalOptions) - - - - - EnableAllWarnings - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - StreamingSIMDExtensions2 - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;%(PreprocessorDefinitions) - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - 4628 - - - %(AdditionalOptions) - %(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - /IGNORE:4264 %(AdditionalOptions) - - - - - EnableAllWarnings - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;%(PreprocessorDefinitions) - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - 4628 - - - %(AdditionalOptions) - %(AdditionalDependencies) - true - Windows - true - true - true - true - true - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - /IGNORE:4264 %(AdditionalOptions) - - - - - EnableAllWarnings - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - Sync - %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;%(PreprocessorDefinitions) - Use - DirectXTexP.h - $(IntDir)$(TargetName).pdb - 4628 - - - %(AdditionalOptions) - %(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - /IGNORE:4264 %(AdditionalOptions) - - - - - Document - - - Document - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/DirectXTex/DirectXTex_Windows81.vcxproj.filters b/DirectXTex/DirectXTex_Windows81.vcxproj.filters deleted file mode 100644 index db38ee6..0000000 --- a/DirectXTex/DirectXTex_Windows81.vcxproj.filters +++ /dev/null @@ -1,163 +0,0 @@ - - - - - {c99f7f80-93a7-4692-8567-779ebabe625b} - - - {586313f2-be7d-4c9c-aa53-09f565530df1} - - - {582e299d-9d25-4208-b5d3-c2eac13e3df0} - - - {e51b4bb7-ec1f-4a4c-8ca7-0da6ceb16465} - - - {53dd160e-d654-4210-ad80-ba533a55a740} - - - - - Header Files - - - Header Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Source Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders - - - Source Files\Shaders - - - Source Files\Shaders - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - \ No newline at end of file diff --git a/DirectXTex/DirectXTex_WindowsPhone81.vcxproj b/DirectXTex/DirectXTex_WindowsPhone81.vcxproj deleted file mode 100644 index cabc65b..0000000 --- a/DirectXTex/DirectXTex_WindowsPhone81.vcxproj +++ /dev/null @@ -1,220 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - ARM - - - Release - ARM - - - - {5709aa1f-d4e3-4138-bdd6-55c8daf3d983} - Win32Proj - DirectXTex - DirectXTex - en-US - 12.0 - true - Windows Phone - 8.1 - - - - StaticLibrary - true - v120_wp81 - - - StaticLibrary - false - v120_wp81 - - - StaticLibrary - true - v120_wp81 - - - StaticLibrary - false - v120_wp81 - - - - - - - - - - - - - - - - - - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - DirectXTex - - - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - DirectXTex - - - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - DirectXTex - - - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - DirectXTex - - - - Use - false - true - DirectXTexP.h - $(IntDir)$(TargetName).pdb - Fast - StreamingSIMDExtensions2 - EnableAllWarnings - - - Console - false - false - - - - - Use - false - true - DirectXTexP.h - $(IntDir)$(TargetName).pdb - Fast - StreamingSIMDExtensions2 - EnableAllWarnings - - - Console - false - false - - - - - Use - false - true - DirectXTexP.h - $(IntDir)$(TargetName).pdb - Fast - EnableAllWarnings - - - Console - false - false - - - - - Use - false - true - DirectXTexP.h - $(IntDir)$(TargetName).pdb - Fast - EnableAllWarnings - - - Console - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - Document - - - Document - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/DirectXTex/DirectXTex_WindowsPhone81.vcxproj.filters b/DirectXTex/DirectXTex_WindowsPhone81.vcxproj.filters deleted file mode 100644 index c232e02..0000000 --- a/DirectXTex/DirectXTex_WindowsPhone81.vcxproj.filters +++ /dev/null @@ -1,161 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - {ae44e5d8-5e05-47c8-92f5-0d6464fff56b} - - - {dc9e6b8b-d350-4f63-895f-790dbd53c33e} - - - {226c7e42-76b6-499d-a4f6-df6ca1643037} - - - {4e237727-0b49-48ae-aae4-2b525ec1e124} - - - {67066457-5e0a-49d3-893a-0ae08a4c0ed5} - - - - - Source Files\Shaders - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders - - - Source Files\Shaders - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - \ No newline at end of file diff --git a/DirectXTex/Filters.h b/DirectXTex/Filters.h index 0c5cdeb..8853e41 100644 --- a/DirectXTex/Filters.h +++ b/DirectXTex/Filters.h @@ -237,7 +237,7 @@ namespace TriangleFilter TriangleRow* next; ScopedAlignedArrayXMVECTOR scanline; - TriangleRow() throw() : remaining(0), next(nullptr) {} + TriangleRow() noexcept : remaining(0), next(nullptr) {} }; static const size_t TF_FILTER_SIZE = sizeof(Filter) - sizeof(FilterFrom); diff --git a/DirectXTex_Desktop_2013.sln b/DirectXTex_Desktop_2013.sln deleted file mode 100644 index 3dd5d29..0000000 --- a/DirectXTex_Desktop_2013.sln +++ /dev/null @@ -1,99 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex\DirectXTex_Desktop_2013.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texassemble", "Texassemble\Texassemble_Desktop_2013.vcxproj", "{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texconv", "Texconv\Texconv_Desktop_2013.vcxproj", "{C3A65381-8FD3-4F69-B29E-654B4B0ED136}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DDSView", "DDSView\DDSView_Desktop_2013.vcxproj", "{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{988C9BEB-76E0-4EFF-AA5F-92750E17C7DC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{B66E9586-79BB-4CDB-9547-7857A789D71A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texdiag", "Texdiag\texdiag_Desktop_2013.vcxproj", "{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Profile|Win32 = Profile|Win32 - Profile|x64 = Profile|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|Win32.ActiveCfg = Debug|Win32 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|Win32.Build.0 = Debug|Win32 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.ActiveCfg = Debug|x64 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.Build.0 = Debug|x64 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|Win32.ActiveCfg = Profile|Win32 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|Win32.Build.0 = Profile|Win32 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.ActiveCfg = Profile|x64 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.Build.0 = Profile|x64 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|Win32.ActiveCfg = Release|Win32 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|Win32.Build.0 = Release|Win32 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.ActiveCfg = Release|x64 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.Build.0 = Release|x64 - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|Win32.Build.0 = Debug|Win32 - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x64.ActiveCfg = Debug|x64 - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x64.Build.0 = Debug|x64 - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|Win32.ActiveCfg = Profile|Win32 - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|Win32.Build.0 = Profile|Win32 - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x64.ActiveCfg = Profile|x64 - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x64.Build.0 = Profile|x64 - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|Win32.ActiveCfg = Release|Win32 - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|Win32.Build.0 = Release|Win32 - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x64.ActiveCfg = Release|x64 - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x64.Build.0 = Release|x64 - {C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|Win32.ActiveCfg = Debug|Win32 - {C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|Win32.Build.0 = Debug|Win32 - {C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x64.ActiveCfg = Debug|x64 - {C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x64.Build.0 = Debug|x64 - {C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|Win32.ActiveCfg = Profile|Win32 - {C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|Win32.Build.0 = Profile|Win32 - {C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x64.ActiveCfg = Profile|x64 - {C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x64.Build.0 = Profile|x64 - {C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|Win32.ActiveCfg = Release|Win32 - {C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|Win32.Build.0 = Release|Win32 - {C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x64.ActiveCfg = Release|x64 - {C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x64.Build.0 = Release|x64 - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|Win32.ActiveCfg = Debug|Win32 - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|Win32.Build.0 = Debug|Win32 - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x64.ActiveCfg = Debug|x64 - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x64.Build.0 = Debug|x64 - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|Win32.ActiveCfg = Profile|Win32 - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|Win32.Build.0 = Profile|Win32 - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x64.ActiveCfg = Profile|x64 - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x64.Build.0 = Profile|x64 - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|Win32.ActiveCfg = Release|Win32 - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|Win32.Build.0 = Release|Win32 - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x64.ActiveCfg = Release|x64 - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x64.Build.0 = Release|x64 - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|Win32.ActiveCfg = Debug|Win32 - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|Win32.Build.0 = Debug|Win32 - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x64.ActiveCfg = Debug|x64 - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x64.Build.0 = Debug|x64 - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|Win32.ActiveCfg = Profile|Win32 - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|Win32.Build.0 = Profile|Win32 - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x64.ActiveCfg = Profile|x64 - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x64.Build.0 = Profile|x64 - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|Win32.ActiveCfg = Release|Win32 - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|Win32.Build.0 = Release|Win32 - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x64.ActiveCfg = Release|x64 - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1} = {988C9BEB-76E0-4EFF-AA5F-92750E17C7DC} - {C3A65381-8FD3-4F69-B29E-654B4B0ED136} = {988C9BEB-76E0-4EFF-AA5F-92750E17C7DC} - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84} = {B66E9586-79BB-4CDB-9547-7857A789D71A} - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D} = {988C9BEB-76E0-4EFF-AA5F-92750E17C7DC} - EndGlobalSection -EndGlobal diff --git a/DirectXTex_Windows81.sln b/DirectXTex_Windows81.sln deleted file mode 100644 index e7cdb38..0000000 --- a/DirectXTex_Windows81.sln +++ /dev/null @@ -1,43 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex\DirectXTex_Windows81.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Profile|ARM = Profile|ARM - Profile|Win32 = Profile|Win32 - Profile|x64 = Profile|x64 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|ARM.ActiveCfg = Debug|ARM - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|ARM.Build.0 = Debug|ARM - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|Win32.ActiveCfg = Debug|Win32 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|Win32.Build.0 = Debug|Win32 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.ActiveCfg = Debug|x64 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.Build.0 = Debug|x64 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|ARM.ActiveCfg = Profile|ARM - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|ARM.Build.0 = Profile|ARM - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|Win32.ActiveCfg = Profile|Win32 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|Win32.Build.0 = Profile|Win32 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.ActiveCfg = Profile|x64 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.Build.0 = Profile|x64 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|ARM.ActiveCfg = Release|ARM - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|ARM.Build.0 = Release|ARM - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|Win32.ActiveCfg = Release|Win32 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|Win32.Build.0 = Release|Win32 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.ActiveCfg = Release|x64 - {371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/DirectXTex_WindowsPhone81.sln b/DirectXTex_WindowsPhone81.sln deleted file mode 100644 index f361ea4..0000000 --- a/DirectXTex_WindowsPhone81.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30324.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex\DirectXTex_WindowsPhone81.vcxproj", "{5709AA1F-D4E3-4138-BDD6-55C8DAF3D983}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5709AA1F-D4E3-4138-BDD6-55C8DAF3D983}.Debug|ARM.ActiveCfg = Debug|ARM - {5709AA1F-D4E3-4138-BDD6-55C8DAF3D983}.Debug|ARM.Build.0 = Debug|ARM - {5709AA1F-D4E3-4138-BDD6-55C8DAF3D983}.Debug|Win32.ActiveCfg = Debug|Win32 - {5709AA1F-D4E3-4138-BDD6-55C8DAF3D983}.Debug|Win32.Build.0 = Debug|Win32 - {5709AA1F-D4E3-4138-BDD6-55C8DAF3D983}.Release|ARM.ActiveCfg = Release|ARM - {5709AA1F-D4E3-4138-BDD6-55C8DAF3D983}.Release|ARM.Build.0 = Release|ARM - {5709AA1F-D4E3-4138-BDD6-55C8DAF3D983}.Release|Win32.ActiveCfg = Release|Win32 - {5709AA1F-D4E3-4138-BDD6-55C8DAF3D983}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/ReadMe.txt b/ReadMe.txt index cab85db..2ee8db7 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -13,9 +13,9 @@ use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and readers and writers since these image file formats are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec. -This code is designed to build with Visual Studio 2013 Update 5, Visual Studio 2015 Update 3, -or Visual Studio 2017. It is recommended that you make use of VS 2015 Update 3, Windows Tools -1.4.1, and the Windows 10 Anniversary Update SDK (14393) or VS 2017 (15.5 update) with the +This code is designed to build with Visual Studio 2015 Update 3 or Visual Studio 2017. +It is recommended that you make use of VS 2015 Update 3, Windows Tools 1.4.1, and the +Windows 10 Anniversary Update SDK (14393) or VS 2017 (15.5 update) or later with the Windows 10 Fall Creators Update SDK (16299). DirectXTex\ diff --git a/Texassemble/Texassemble_Desktop_2013.vcxproj b/Texassemble/Texassemble_Desktop_2013.vcxproj deleted file mode 100644 index 9ce81e0..0000000 --- a/Texassemble/Texassemble_Desktop_2013.vcxproj +++ /dev/null @@ -1,407 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Profile - Win32 - - - Profile - x64 - - - Release - Win32 - - - Release - x64 - - - - texassemble - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1} - texassemble - Win32Proj - $(VCTargetsPath11) - - - - Application - Unicode - v120 - - - Application - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texassemble - true - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texassemble - true - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texassemble - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texassemble - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texassemble - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texassemble - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - - Level4 - Disabled - MultiThreadedDebugDLL - false - true - Fast - StreamingSIMDExtensions2 - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - EditAndContinue - EnableFastChecks - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - Console - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - Disabled - MultiThreadedDebugDLL - false - true - Fast - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - EnableFastChecks - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - Console - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - StreamingSIMDExtensions2 - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Console - true - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Console - true - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - StreamingSIMDExtensions2 - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Console - true - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Console - true - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - - - - - - - {371b9fa9-4c90-4ac6-a123-aced756d6c77} - - - - - - - \ No newline at end of file diff --git a/Texassemble/Texassemble_Desktop_2013.vcxproj.filters b/Texassemble/Texassemble_Desktop_2013.vcxproj.filters deleted file mode 100644 index 781df78..0000000 --- a/Texassemble/Texassemble_Desktop_2013.vcxproj.filters +++ /dev/null @@ -1,17 +0,0 @@ - - - - - {8e114980-c1a3-4ada-ad7c-83caadf5daeb} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - - - - Resource Files - - - \ No newline at end of file diff --git a/Texassemble/texassemble.cpp b/Texassemble/texassemble.cpp index 50b6f60..cf10c00 100644 --- a/Texassemble/texassemble.cpp +++ b/Texassemble/texassemble.cpp @@ -412,16 +412,16 @@ namespace void PrintInfo(const TexMetadata& info) { - wprintf(L" (%Iux%Iu", info.width, info.height); + wprintf(L" (%zux%zu", info.width, info.height); if (TEX_DIMENSION_TEXTURE3D == info.dimension) - wprintf(L"x%Iu", info.depth); + wprintf(L"x%zu", info.depth); if (info.mipLevels > 1) - wprintf(L",%Iu", info.mipLevels); + wprintf(L",%zu", info.mipLevels); if (info.arraySize > 1) - wprintf(L",%Iu", info.arraySize); + wprintf(L",%zu", info.arraySize); wprintf(L" "); PrintFormat(info.format); @@ -1014,7 +1014,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) switch (dwOption) { case OPT_WIDTH: - if (swscanf_s(pValue, L"%Iu", &width) != 1) + if (swscanf_s(pValue, L"%zu", &width) != 1) { wprintf(L"Invalid value specified with -w (%ls)\n", pValue); return 1; @@ -1022,7 +1022,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) break; case OPT_HEIGHT: - if (swscanf_s(pValue, L"%Iu", &height) != 1) + if (swscanf_s(pValue, L"%zu", &height) != 1) { wprintf(L"Invalid value specified with -h (%ls)\n", pValue); return 1; diff --git a/Texconv/Texconv_Desktop_2013.vcxproj b/Texconv/Texconv_Desktop_2013.vcxproj deleted file mode 100644 index 1b1354a..0000000 --- a/Texconv/Texconv_Desktop_2013.vcxproj +++ /dev/null @@ -1,407 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Profile - Win32 - - - Profile - x64 - - - Release - Win32 - - - Release - x64 - - - - texconv - {C3A65381-8FD3-4F69-B29E-654B4B0ED136} - texconv - Win32Proj - $(VCTargetsPath11) - - - - Application - Unicode - v120 - - - Application - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texconv - true - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texconv - true - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texconv - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texconv - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texconv - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texconv - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - - Level4 - Disabled - MultiThreadedDebugDLL - true - true - Fast - StreamingSIMDExtensions2 - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - EditAndContinue - EnableFastChecks - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - Console - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - Disabled - MultiThreadedDebugDLL - true - true - Fast - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - EnableFastChecks - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - Console - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - StreamingSIMDExtensions2 - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Console - true - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Console - true - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - StreamingSIMDExtensions2 - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Console - true - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Console - true - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - - - - - - - {371b9fa9-4c90-4ac6-a123-aced756d6c77} - - - - - - - \ No newline at end of file diff --git a/Texconv/Texconv_Desktop_2013.vcxproj.filters b/Texconv/Texconv_Desktop_2013.vcxproj.filters deleted file mode 100644 index 50ba8f9..0000000 --- a/Texconv/Texconv_Desktop_2013.vcxproj.filters +++ /dev/null @@ -1,17 +0,0 @@ - - - - - {8e114980-c1a3-4ada-ad7c-83caadf5daeb} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - - - - Resource Files - - - \ No newline at end of file diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp index 0109cbb..d7ac5fd 100644 --- a/Texconv/texconv.cpp +++ b/Texconv/texconv.cpp @@ -574,16 +574,16 @@ namespace void PrintInfo(const TexMetadata& info) { - wprintf(L" (%Iux%Iu", info.width, info.height); + wprintf(L" (%zux%zu", info.width, info.height); if (TEX_DIMENSION_TEXTURE3D == info.dimension) - wprintf(L"x%Iu", info.depth); + wprintf(L"x%zu", info.depth); if (info.mipLevels > 1) - wprintf(L",%Iu", info.mipLevels); + wprintf(L",%zu", info.mipLevels); if (info.arraySize > 1) - wprintf(L",%Iu", info.arraySize); + wprintf(L",%zu", info.arraySize); wprintf(L" "); PrintFormat(info.format); @@ -1194,7 +1194,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) switch (dwOption) { case OPT_WIDTH: - if (swscanf_s(pValue, L"%Iu", &width) != 1) + if (swscanf_s(pValue, L"%zu", &width) != 1) { wprintf(L"Invalid value specified with -w (%ls)\n", pValue); wprintf(L"\n"); @@ -1204,7 +1204,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) break; case OPT_HEIGHT: - if (swscanf_s(pValue, L"%Iu", &height) != 1) + if (swscanf_s(pValue, L"%zu", &height) != 1) { wprintf(L"Invalid value specified with -h (%ls)\n", pValue); printf("\n"); @@ -1214,7 +1214,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) break; case OPT_MIPLEVELS: - if (swscanf_s(pValue, L"%Iu", &mipLevels) != 1) + if (swscanf_s(pValue, L"%zu", &mipLevels) != 1) { wprintf(L"Invalid value specified with -m (%ls)\n", pValue); wprintf(L"\n"); diff --git a/Texdiag/texdiag.cpp b/Texdiag/texdiag.cpp index 1908e8f..3b40cc3 100644 --- a/Texdiag/texdiag.cpp +++ b/Texdiag/texdiag.cpp @@ -686,7 +686,7 @@ namespace if ((specials_x > 0) || (specials_y > 0) || (specials_z > 0) || (specials_w > 0)) { - wprintf(L" FP specials - (%Iu %Iu %Iu %Iu)\n", specials_x, specials_y, specials_z, specials_w); + wprintf(L" FP specials - (%zu %zu %zu %zu)\n", specials_x, specials_y, specials_z, specials_w); } } }; @@ -793,36 +793,36 @@ namespace { wprintf(L"\t Compression - "); PrintFormat(fmt); - wprintf(L"\n\t Total blocks - %Iu\n", blocks); + wprintf(L"\n\t Total blocks - %zu\n", blocks); switch (fmt) { case DXGI_FORMAT_BC1_UNORM: case DXGI_FORMAT_BC1_UNORM_SRGB: - wprintf(L"\t 4 color blocks - %Iu\n", blockHist[0]); - wprintf(L"\t 3 color blocks - %Iu\n", blockHist[1]); + wprintf(L"\t 4 color blocks - %zu\n", blockHist[0]); + wprintf(L"\t 3 color blocks - %zu\n", blockHist[1]); break; // BC2 only has a single 'type' of block case DXGI_FORMAT_BC3_UNORM: case DXGI_FORMAT_BC3_UNORM_SRGB: - wprintf(L"\t 8 alpha blocks - %Iu\n", blockHist[0]); - wprintf(L"\t 6 alpha blocks - %Iu\n", blockHist[1]); + wprintf(L"\t 8 alpha blocks - %zu\n", blockHist[0]); + wprintf(L"\t 6 alpha blocks - %zu\n", blockHist[1]); break; case DXGI_FORMAT_BC4_UNORM: case DXGI_FORMAT_BC4_SNORM: - wprintf(L"\t 8 red blocks - %Iu\n", blockHist[0]); - wprintf(L"\t 6 red blocks - %Iu\n", blockHist[1]); + wprintf(L"\t 8 red blocks - %zu\n", blockHist[0]); + wprintf(L"\t 6 red blocks - %zu\n", blockHist[1]); break; case DXGI_FORMAT_BC5_UNORM: case DXGI_FORMAT_BC5_SNORM: - wprintf(L"\t 8 red blocks - %Iu\n", blockHist[0]); - wprintf(L"\t 6 red blocks - %Iu\n", blockHist[1]); - wprintf(L"\t 8 green blocks - %Iu\n", blockHist[2]); - wprintf(L"\t 6 green blocks - %Iu\n", blockHist[3]); + wprintf(L"\t 8 red blocks - %zu\n", blockHist[0]); + wprintf(L"\t 6 red blocks - %zu\n", blockHist[1]); + wprintf(L"\t 8 green blocks - %zu\n", blockHist[2]); + wprintf(L"\t 6 green blocks - %zu\n", blockHist[3]); break; case DXGI_FORMAT_BC6H_UF16: @@ -830,10 +830,10 @@ namespace for (size_t j = 1; j <= 14; ++j) { if (blockHist[j] > 0) - wprintf(L"\t Mode %02Iu blocks - %Iu\n", j, blockHist[j]); + wprintf(L"\t Mode %02Iu blocks - %zu\n", j, blockHist[j]); } if (blockHist[0] > 0) - wprintf(L"\tReserved mode blcks - %Iu\n", blockHist[0]); + wprintf(L"\tReserved mode blcks - %zu\n", blockHist[0]); break; case DXGI_FORMAT_BC7_UNORM: @@ -841,10 +841,10 @@ namespace for (size_t j = 0; j <= 7; ++j) { if (blockHist[j] > 0) - wprintf(L"\t Mode %02Iu blocks - %Iu\n", j, blockHist[j]); + wprintf(L"\t Mode %02Iu blocks - %zu\n", j, blockHist[j]); } if (blockHist[8] > 0) - wprintf(L"\tReserved mode blcks - %Iu\n", blockHist[8]); + wprintf(L"\tReserved mode blcks - %zu\n", blockHist[8]); break; } } @@ -1521,7 +1521,7 @@ namespace continue; } - wprintf(L" Block %Iu (pixel: %Iu x %Iu)\n", nblock, w, h); + wprintf(L" Block %zu (pixel: %zu x %zu)\n", nblock, w, h); switch (image.format) { case DXGI_FORMAT_BC1_UNORM: @@ -3547,11 +3547,11 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) if (dwCommand == CMD_INFO) { // --- Info ---------------------------------------------------------------- - wprintf(L" width = %Iu\n", info.width); - wprintf(L" height = %Iu\n", info.height); - wprintf(L" depth = %Iu\n", info.depth); - wprintf(L" mipLevels = %Iu\n", info.mipLevels); - wprintf(L" arraySize = %Iu\n", info.arraySize); + wprintf(L" width = %zu\n", info.width); + wprintf(L" height = %zu\n", info.height); + wprintf(L" depth = %zu\n", info.depth); + wprintf(L" mipLevels = %zu\n", info.mipLevels); + wprintf(L" arraySize = %zu\n", info.arraySize); wprintf(L" format = "); PrintFormat(info.format); wprintf(L"\n dimension = "); @@ -3594,7 +3594,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) break; } - wprintf(L"\n images = %Iu\n", image->GetImageCount()); + wprintf(L"\n images = %zu\n", image->GetImageCount()); auto sizeInKb = static_cast(image->GetPixelsSize() / 1024); @@ -3713,7 +3713,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) if (pixelx >= (int)info.width || pixely >= (int)info.height) { - wprintf(L"WARNING: Specified pixel location (%d x %d) is out of range for image (%Iu x %Iu)\n", pixelx, pixely, info.width, info.height); + wprintf(L"WARNING: Specified pixel location (%d x %d) is out of range for image (%zu x %zu)\n", pixelx, pixely, info.width, info.height); continue; } diff --git a/Texdiag/texdiag_Desktop_2013.vcxproj b/Texdiag/texdiag_Desktop_2013.vcxproj deleted file mode 100644 index 7ef793d..0000000 --- a/Texdiag/texdiag_Desktop_2013.vcxproj +++ /dev/null @@ -1,407 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Profile - Win32 - - - Profile - x64 - - - Release - Win32 - - - Release - x64 - - - - texdiag - {8E31A619-F4F8-413F-A973-4EE37B1AAA5D} - texdiag - Win32Proj - $(VCTargetsPath11) - - - - Application - Unicode - v120 - - - Application - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texdiag - true - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texdiag - true - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texdiag - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texdiag - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texdiag - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - Bin\Desktop_2013\$(Platform)\$(Configuration)\ - texdiag - false - true - $(ExecutablePath) - $(IncludePath) - $(LibraryPath) - - - - Level4 - Disabled - MultiThreadedDebugDLL - false - true - Fast - StreamingSIMDExtensions2 - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - EditAndContinue - EnableFastChecks - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - Console - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - Disabled - MultiThreadedDebugDLL - false - true - Fast - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - EnableFastChecks - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - Console - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - StreamingSIMDExtensions2 - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Console - true - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Console - true - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - StreamingSIMDExtensions2 - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Console - true - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - Sync - ..\DirectXTex;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - %(AdditionalOptions) - ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) - true - Console - true - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - - - false - - - - - - - - - - - - - - - - - - - {371b9fa9-4c90-4ac6-a123-aced756d6c77} - - - - - - - \ No newline at end of file diff --git a/Texdiag/texdiag_Desktop_2013.vcxproj.filters b/Texdiag/texdiag_Desktop_2013.vcxproj.filters deleted file mode 100644 index 3a2f907..0000000 --- a/Texdiag/texdiag_Desktop_2013.vcxproj.filters +++ /dev/null @@ -1,17 +0,0 @@ - - - - - {8e114980-c1a3-4ada-ad7c-83caadf5daeb} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - - - - Resource Files - - - \ No newline at end of file