diff --git a/DDSTextureLoader/DDSTextureLoader.cpp b/DDSTextureLoader/DDSTextureLoader.cpp index d079880..3bfca4f 100644 --- a/DDSTextureLoader/DDSTextureLoader.cpp +++ b/DDSTextureLoader/DDSTextureLoader.cpp @@ -25,14 +25,6 @@ #include "DDSTextureLoader.h" -#ifndef _WIN32_WINNT_WIN8 -#define _WIN32_WINNT_WIN8 0x0602 -#endif - -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) && !defined(DXGI_1_2_FORMATS) -#define DXGI_1_2_FORMATS -#endif - #if defined(_DEBUG) || defined(PROFILE) #pragma comment(lib,"dxguid.lib") #endif @@ -361,10 +353,7 @@ static size_t BitsPerPixel( _In_ DXGI_FORMAT fmt ) case DXGI_FORMAT_R16_SINT: case DXGI_FORMAT_B5G6R5_UNORM: case DXGI_FORMAT_B5G5R5A1_UNORM: - -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: -#endif return 16; case DXGI_FORMAT_R8_TYPELESS: @@ -577,14 +566,12 @@ static DXGI_FORMAT GetDXGIFormat( const DDS_PIXELFORMAT& ddpf ) // No DXGI format maps to ISBITMASK(0x7c00,0x03e0,0x001f,0x0000) aka D3DFMT_X1R5G5B5 -#ifdef DXGI_1_2_FORMATS if (ISBITMASK(0x0f00,0x00f0,0x000f,0xf000)) { return DXGI_FORMAT_B4G4R4A4_UNORM; } // No DXGI format maps to ISBITMASK(0x0f00,0x00f0,0x000f,0x0000) aka D3DFMT_X4R4G4B4 -#endif // No 3:3:2, 3:3:2:8, or paletted DXGI formats aka D3DFMT_A8R3G3B2, D3DFMT_R3G3B2, D3DFMT_P8, D3DFMT_A8P8, etc. break; diff --git a/DDSView/DDSView_Desktop_2010.vcxproj b/DDSView/DDSView_Desktop_2010.vcxproj index ca639ab..adf6e0b 100644 --- a/DDSView/DDSView_Desktop_2010.vcxproj +++ b/DDSView/DDSView_Desktop_2010.vcxproj @@ -65,64 +65,52 @@ + + + + + + true true - $(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(LibraryPath) true true - $(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(LibraryPath) false true - $(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(LibraryPath) false true - $(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(LibraryPath) false true - $(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(LibraryPath) false true - $(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(LibraryPath) @@ -134,9 +122,9 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EditAndContinue EnableFastChecks @@ -173,9 +161,9 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EnableFastChecks @@ -213,9 +201,9 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) %(AdditionalOptions) @@ -253,9 +241,9 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) %(AdditionalOptions) @@ -294,9 +282,9 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) %(AdditionalOptions) @@ -334,9 +322,9 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) %(AdditionalOptions) @@ -371,12 +359,12 @@ - - {371b9fa9-4c90-4ac6-a123-aced756d6c77} - + - + + {371b9fa9-4c90-4ac6-a123-aced756d6c77} + diff --git a/DDSView/DDSView_Desktop_2010_SDK81.sln b/DDSView/DDSView_Desktop_2010_SDK81.sln deleted file mode 100644 index ca68f5c..0000000 --- a/DDSView/DDSView_Desktop_2010_SDK81.sln +++ /dev/null @@ -1,45 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DDSView", "DDSView_Desktop_2010_SDK81.vcxproj", "{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\DirectXTex\DirectXTex_Desktop_2010_SDK81.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" -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 - {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 - {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 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/DDSView/DDSView_Desktop_2010_SDK81.vcxproj b/DDSView/DDSView_Desktop_2010_SDK81.vcxproj deleted file mode 100644 index adf6e0b..0000000 --- a/DDSView/DDSView_Desktop_2010_SDK81.vcxproj +++ /dev/null @@ -1,371 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Profile - Win32 - - - Profile - x64 - - - Release - Win32 - - - Release - x64 - - - - DDSView - {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84} - DDSView - Win32Proj - - - - Application - Unicode - - - Application - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - - - true - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - 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_2010_SDK81.vcxproj.filters b/DDSView/DDSView_Desktop_2010_SDK81.vcxproj.filters deleted file mode 100644 index e546d45..0000000 --- a/DDSView/DDSView_Desktop_2010_SDK81.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 e49f6c0..5d3d7cb 100644 --- a/DDSView/ddsview.cpp +++ b/DDSView/ddsview.cpp @@ -12,11 +12,7 @@ #include #include -#ifdef USE_XNAMATH -#include -#else #include -#endif #include "DirectXTex.h" diff --git a/DirectXTex/BC.cpp b/DirectXTex/BC.cpp index 2989544..c5ab988 100644 --- a/DirectXTex/BC.cpp +++ b/DirectXTex/BC.cpp @@ -21,9 +21,7 @@ #include "BC.h" -#ifndef USE_XNAMATH using namespace DirectX::PackedVector; -#endif namespace DirectX { diff --git a/DirectXTex/BC.h b/DirectXTex/BC.h index c24b372..b723aef 100644 --- a/DirectXTex/BC.h +++ b/DirectXTex/BC.h @@ -18,30 +18,12 @@ #endif #include - -#ifdef USE_XNAMATH -#include -#else #include #include -#endif - -#include - -#pragma warning(push) -#pragma warning(disable : 4005) -#include -#pragma warning(pop) namespace DirectX { -#ifndef USE_XNAMATH -typedef PackedVector::HALF HALF; -typedef PackedVector::XMHALF4 XMHALF4; -typedef PackedVector::XMU565 XMU565; -#endif - //------------------------------------------------------------------------------------- // Constants //------------------------------------------------------------------------------------- @@ -369,7 +351,7 @@ public: void Set(_In_ const HDRColorA& c, _In_ bool bSigned) { - XMHALF4 aF16; + PackedVector::XMHALF4 aF16; XMVECTOR v = XMLoadFloat4( (const XMFLOAT4*)& c ); XMStoreHalf4( &aF16, v ); @@ -395,7 +377,7 @@ public: return *this; } - void ToF16(_Out_writes_(3) HALF aF16[3], _In_ bool bSigned) const + void ToF16(_Out_writes_(3) PackedVector::HALF aF16[3], _In_ bool bSigned) const { aF16[0] = INT2F16(r, bSigned); aF16[1] = INT2F16(g, bSigned); @@ -403,7 +385,7 @@ public: } private: - static int F16ToINT(_In_ const HALF& f, _In_ bool bSigned) + static int F16ToINT(_In_ const PackedVector::HALF& f, _In_ bool bSigned) { uint16_t input = *((const uint16_t*) &f); int out, s; @@ -423,9 +405,9 @@ private: return out; } - static HALF INT2F16(_In_ int input, _In_ bool bSigned) + static PackedVector::HALF INT2F16(_In_ int input, _In_ bool bSigned) { - HALF h; + PackedVector::HALF h; uint16_t out; if(bSigned) { diff --git a/DirectXTex/BC6HBC7.cpp b/DirectXTex/BC6HBC7.cpp index 540bfa5..28495e9 100644 --- a/DirectXTex/BC6HBC7.cpp +++ b/DirectXTex/BC6HBC7.cpp @@ -17,9 +17,7 @@ #include "BC.h" -#ifndef USE_XNAMATH using namespace DirectX::PackedVector; -#endif namespace DirectX { diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h index 89e8e79..b3f65b5 100644 --- a/DirectXTex/DirectXTex.h +++ b/DirectXTex/DirectXTex.h @@ -38,27 +38,6 @@ #define DIRECTX_TEX_VERSION 120 -#if defined(_MSC_VER) && (_MSC_VER<1610) && !defined(_In_reads_) -#define _Analysis_assume_(exp) -#define _In_reads_(exp) -#define _In_reads_opt_(exp) -#define _Out_writes_(exp) -#define _Out_writes_opt_(exp) -#define _In_reads_bytes_(exp) -#define _Out_writes_bytes_(exp) -#define _Out_writes_bytes_to_opt_(a,b) -#define _Inout_updates_bytes_(exp) -#define _Inout_updates_all_(exp) -#define _Inout_updates_all_opt_(exp) -#define _Outptr_ -#define _COM_Outptr_ -#define _When_(a,b) -#endif - -#ifndef _Use_decl_annotations_ -#define _Use_decl_annotations_ -#endif - namespace DirectX { @@ -481,7 +460,7 @@ namespace DirectX // if the input format type is IsSRGB(), then SRGB_IN is on by default // if the output format type is IsSRGB(), then SRGB_OUT is on by default }; - + HRESULT PremultiplyAlpha( _In_ const Image& srcImage, _In_ DWORD flags, _Out_ ScratchImage& image ); HRESULT PremultiplyAlpha( _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata, _In_ DWORD flags, _Out_ ScratchImage& result ); // Converts to a premultiplied alpha version of the texture diff --git a/DirectXTex/DirectXTex.inl b/DirectXTex/DirectXTex.inl index 07202d8..8e19d1b 100644 --- a/DirectXTex/DirectXTex.inl +++ b/DirectXTex/DirectXTex.inl @@ -24,11 +24,7 @@ _Use_decl_annotations_ inline bool IsValid( DXGI_FORMAT fmt ) { -#ifdef DXGI_1_2_FORMATS return ( static_cast(fmt) >= 1 && static_cast(fmt) <= 115 ); -#else - return ( static_cast(fmt) >= 1 && static_cast(fmt) <= 99 ); -#endif } _Use_decl_annotations_ @@ -74,7 +70,6 @@ inline bool IsPacked( DXGI_FORMAT fmt ) _Use_decl_annotations_ inline bool IsVideo( DXGI_FORMAT fmt ) { -#ifdef DXGI_1_2_FORMATS switch ( fmt ) { case DXGI_FORMAT_AYUV: @@ -101,10 +96,6 @@ inline bool IsVideo( DXGI_FORMAT fmt ) default: return false; } -#else // !DXGI_1_2_FORMATS - UNREFERENCED_PARAMETER(fmt); - return false; -#endif } _Use_decl_annotations_ @@ -208,9 +199,7 @@ inline bool HasAlpha( DXGI_FORMAT fmt ) case DXGI_FORMAT_BC7_TYPELESS: case DXGI_FORMAT_BC7_UNORM: case DXGI_FORMAT_BC7_UNORM_SRGB: -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: -#endif return true; default: diff --git a/DirectXTex/DirectXTexConvert.cpp b/DirectXTex/DirectXTexConvert.cpp index 95e2ff4..dcf0582 100644 --- a/DirectXTex/DirectXTexConvert.cpp +++ b/DirectXTex/DirectXTexConvert.cpp @@ -15,13 +15,7 @@ #include "directxtexp.h" -#ifdef USE_XNAMATH -#if XNAMATH_VERSION < 205 -#error This file requires XNAMATH v2.05 or later -#endif -#else using namespace DirectX::PackedVector; -#endif #if DIRECTX_MATH_VERSION < 306 namespace @@ -252,7 +246,6 @@ void _CopyScanline(_When_(pDestination == pSource, _Inout_updates_bytes_(outSize memset( pDestination, 0xff, outSize ); return; -#ifdef DXGI_1_2_FORMATS //----------------------------------------------------------------------------- case DXGI_FORMAT_B4G4R4A4_UNORM: if ( inSize >= 2 && outSize >= 2 ) @@ -277,7 +270,6 @@ void _CopyScanline(_When_(pDestination == pSource, _Inout_updates_bytes_(outSize } } return; -#endif // DXGI_1_2_FORMATS } } @@ -471,7 +463,6 @@ bool _ExpandScanline( LPVOID pDestination, size_t outSize, DXGI_FORMAT outFormat } return false; -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: if ( outFormat != DXGI_FORMAT_R8G8B8A8_UNORM ) return false; @@ -496,7 +487,6 @@ bool _ExpandScanline( LPVOID pDestination, size_t outSize, DXGI_FORMAT outFormat return true; } return false; -#endif // DXGI_1_2_FORMATS } return false; @@ -1108,7 +1098,6 @@ bool _LoadScanline( XMVECTOR* pDestination, size_t count, } return false; -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: if ( size >= sizeof(XMUNIBBLE4) ) { @@ -1126,7 +1115,6 @@ bool _LoadScanline( XMVECTOR* pDestination, size_t count, return false; // we don't support the video formats ( see IsVideo function ) -#endif // DXGI_1_2_FORMATS default: return false; @@ -1692,7 +1680,6 @@ bool _StoreScanline( LPVOID pDestination, size_t size, DXGI_FORMAT format, } return false; -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: if ( size >= sizeof(XMUNIBBLE4) ) { @@ -1710,7 +1697,6 @@ bool _StoreScanline( LPVOID pDestination, size_t size, DXGI_FORMAT format, return false; // We don't support the video formats ( see IsVideo function ) -#endif // DXGI_1_2_FORMATS default: return false; @@ -1947,9 +1933,7 @@ bool _StoreScanlineLinear( LPVOID pDestination, size_t size, DXGI_FORMAT format, case DXGI_FORMAT_B5G5R5A1_UNORM: case DXGI_FORMAT_B8G8R8A8_UNORM: case DXGI_FORMAT_B8G8R8X8_UNORM: -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: -#endif break; default: @@ -2037,9 +2021,7 @@ bool _LoadScanlineLinear( XMVECTOR* pDestination, size_t count, case DXGI_FORMAT_B5G5R5A1_UNORM: case DXGI_FORMAT_B8G8R8A8_UNORM: case DXGI_FORMAT_B8G8R8X8_UNORM: -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: -#endif break; default: @@ -2151,9 +2133,7 @@ static const ConvertData g_ConvertTable[] = { { DXGI_FORMAT_BC6H_SF16, 16, CONVF_FLOAT | CONVF_BC | CONVF_R | CONVF_G | CONVF_B | CONVF_A }, { DXGI_FORMAT_BC7_UNORM, 8, CONVF_UNORM | CONVF_BC | CONVF_R | CONVF_G | CONVF_B | CONVF_A }, { DXGI_FORMAT_BC7_UNORM_SRGB, 8, CONVF_UNORM | CONVF_BC | CONVF_R | CONVF_G | CONVF_B | CONVF_A }, -#ifdef DXGI_1_2_FORMATS { DXGI_FORMAT_B4G4R4A4_UNORM, 4, CONVF_UNORM | CONVF_BGR | CONVF_R | CONVF_G | CONVF_B | CONVF_A }, -#endif }; #pragma prefast( suppress : 25004, "Signature must match bsearch_s" ); @@ -3049,10 +3029,8 @@ bool _StoreScanlineDither( LPVOID pDestination, size_t size, DXGI_FORMAT format, } return false; -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: STORE_SCANLINE( XMUNIBBLE4, g_Scale4pc, true, true, uint8_t, 0xF, y, true ) -#endif default: return _StoreScanline( pDestination, size, format, pSource, count, threshold ); diff --git a/DirectXTex/DirectXTexD3D11.cpp b/DirectXTex/DirectXTexD3D11.cpp index f117a12..cfaba5a 100644 --- a/DirectXTex/DirectXTexD3D11.cpp +++ b/DirectXTex/DirectXTexD3D11.cpp @@ -228,10 +228,10 @@ bool IsSupportedTexture( ID3D11Device* pDevice, const TexMetadata& metadata ) if ( fl < D3D_FEATURE_LEVEL_10_0 ) { - if ( (arraySize > 1) || (iWidth > 4096 /*D3D_FL9_3_REQ_TEXTURE1D_U_DIMENSION*/) ) + if ( (arraySize > 1) || (iWidth > D3D_FL9_3_REQ_TEXTURE1D_U_DIMENSION) ) return false; - if ( (fl < D3D_FEATURE_LEVEL_9_3) && (iWidth > 2048 /*D3D_FL9_1_REQ_TEXTURE1D_U_DIMENSION*/ ) ) + if ( (fl < D3D_FEATURE_LEVEL_9_3) && (iWidth > D3D_FL9_1_REQ_TEXTURE1D_U_DIMENSION ) ) return false; } } @@ -260,13 +260,13 @@ bool IsSupportedTexture( ID3D11Device* pDevice, const TexMetadata& metadata ) if ( fl < D3D_FEATURE_LEVEL_10_0 ) { - if ( (iWidth > 4096 /*D3D_FL9_3_REQ_TEXTURECUBE_DIMENSION*/ ) - || (iHeight > 4096 /*D3D_FL9_3_REQ_TEXTURECUBE_DIMENSION*/ ) ) + if ( (iWidth > D3D_FL9_3_REQ_TEXTURECUBE_DIMENSION ) + || (iHeight > D3D_FL9_3_REQ_TEXTURECUBE_DIMENSION ) ) return false; if ( (fl < D3D_FEATURE_LEVEL_9_3) - && ( (iWidth > 512 /*D3D_FL9_1_REQ_TEXTURECUBE_DIMENSION*/) - || (iHeight > 512 /*D3D_FL9_1_REQ_TEXTURECUBE_DIMENSION*/) ) ) + && ( (iWidth > D3D_FL9_1_REQ_TEXTURECUBE_DIMENSION) + || (iHeight > D3D_FL9_1_REQ_TEXTURECUBE_DIMENSION) ) ) return false; } } @@ -291,13 +291,13 @@ bool IsSupportedTexture( ID3D11Device* pDevice, const TexMetadata& metadata ) if ( fl < D3D_FEATURE_LEVEL_10_0 ) { if ( (arraySize > 1) - || (iWidth > 4096 /*D3D_FL9_3_REQ_TEXTURE2D_U_OR_V_DIMENSION*/) - || (iHeight > 4096 /*D3D_FL9_3_REQ_TEXTURE2D_U_OR_V_DIMENSION*/) ) + || (iWidth > D3D_FL9_3_REQ_TEXTURE2D_U_OR_V_DIMENSION) + || (iHeight > D3D_FL9_3_REQ_TEXTURE2D_U_OR_V_DIMENSION) ) return false; if ( (fl < D3D_FEATURE_LEVEL_9_3) - && ( (iWidth > 2048 /*D3D_FL9_1_REQ_TEXTURE2D_U_OR_V_DIMENSION*/) - || (iHeight > 2048 /*D3D_FL9_1_REQ_TEXTURE2D_U_OR_V_DIMENSION*/) ) ) + && ( (iWidth > D3D_FL9_1_REQ_TEXTURE2D_U_OR_V_DIMENSION) + || (iHeight > D3D_FL9_1_REQ_TEXTURE2D_U_OR_V_DIMENSION) ) ) return false; } } @@ -323,9 +323,9 @@ bool IsSupportedTexture( ID3D11Device* pDevice, const TexMetadata& metadata ) if ( fl < D3D_FEATURE_LEVEL_10_0 ) { - if ( (iWidth > 256 /*D3D_FL9_1_REQ_TEXTURE3D_U_V_OR_W_DIMENSION*/) - || (iHeight > 256 /*D3D_FL9_1_REQ_TEXTURE3D_U_V_OR_W_DIMENSION*/) - || (iDepth > 256 /*D3D_FL9_1_REQ_TEXTURE3D_U_V_OR_W_DIMENSION*/) ) + if ( (iWidth > D3D_FL9_1_REQ_TEXTURE3D_U_V_OR_W_DIMENSION) + || (iHeight > D3D_FL9_1_REQ_TEXTURE3D_U_V_OR_W_DIMENSION) + || (iDepth > D3D_FL9_1_REQ_TEXTURE3D_U_V_OR_W_DIMENSION) ) return false; } } @@ -583,13 +583,13 @@ HRESULT CreateShaderResourceViewEx( ID3D11Device* pDevice, const Image* srcImage case TEX_DIMENSION_TEXTURE1D: if ( metadata.arraySize > 1 ) { - SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1DARRAY; + SRVDesc.ViewDimension = D3D_SRV_DIMENSION_TEXTURE1DARRAY; SRVDesc.Texture1DArray.MipLevels = static_cast( metadata.mipLevels ); SRVDesc.Texture1DArray.ArraySize = static_cast( metadata.arraySize ); } else { - SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1D; + SRVDesc.ViewDimension = D3D_SRV_DIMENSION_TEXTURE1D; SRVDesc.Texture1D.MipLevels = static_cast( metadata.mipLevels ); } break; @@ -600,32 +600,32 @@ HRESULT CreateShaderResourceViewEx( ID3D11Device* pDevice, const Image* srcImage if (metadata.arraySize > 6) { assert( (metadata.arraySize % 6) == 0 ); - SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBEARRAY; + SRVDesc.ViewDimension = D3D_SRV_DIMENSION_TEXTURECUBEARRAY; SRVDesc.TextureCubeArray.MipLevels = static_cast( metadata.mipLevels ); SRVDesc.TextureCubeArray.NumCubes = static_cast( metadata.arraySize / 6 ); } else { - SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBE; + SRVDesc.ViewDimension = D3D_SRV_DIMENSION_TEXTURECUBE; SRVDesc.TextureCube.MipLevels = static_cast( metadata.mipLevels ); } } else if ( metadata.arraySize > 1 ) { - SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY; + SRVDesc.ViewDimension = D3D_SRV_DIMENSION_TEXTURE2DARRAY; SRVDesc.Texture2DArray.MipLevels = static_cast( metadata.mipLevels ); SRVDesc.Texture2DArray.ArraySize = static_cast( metadata.arraySize ); } else { - SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; + SRVDesc.ViewDimension = D3D_SRV_DIMENSION_TEXTURE2D; SRVDesc.Texture2D.MipLevels = static_cast( metadata.mipLevels ); } break; case TEX_DIMENSION_TEXTURE3D: assert( metadata.arraySize == 1 ); - SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D; + SRVDesc.ViewDimension = D3D_SRV_DIMENSION_TEXTURE3D; SRVDesc.Texture3D.MipLevels = static_cast( metadata.mipLevels ); break; diff --git a/DirectXTex/DirectXTexDDS.cpp b/DirectXTex/DirectXTexDDS.cpp index dc99a75..0f9f3bd 100644 --- a/DirectXTex/DirectXTexDDS.cpp +++ b/DirectXTex/DirectXTexDDS.cpp @@ -118,21 +118,11 @@ const LegacyDDS g_LegacyDDSMap[] = { DXGI_FORMAT_R8G8B8A8_UNORM, CONV_FLAGS_EXPAND | CONV_FLAGS_PAL8, { sizeof(DDS_PIXELFORMAT), DDS_PAL8, 0, 8, 0, 0, 0, 0 } }, // D3DFMT_P8 -#ifdef DXGI_1_2_FORMATS { DXGI_FORMAT_B4G4R4A4_UNORM, CONV_FLAGS_4444, DDSPF_A4R4G4B4 }, // D3DFMT_A4R4G4B4 (uses DXGI 1.2 format) { DXGI_FORMAT_B4G4R4A4_UNORM, CONV_FLAGS_NOALPHA | CONV_FLAGS_4444, { sizeof(DDS_PIXELFORMAT), DDS_RGB, 0, 16, 0x0f00, 0x00f0, 0x000f, 0x0000 } }, // D3DFMT_X4R4G4B4 (uses DXGI 1.2 format) { DXGI_FORMAT_B4G4R4A4_UNORM, CONV_FLAGS_EXPAND | CONV_FLAGS_44, { sizeof(DDS_PIXELFORMAT), DDS_LUMINANCE, 0, 8, 0x0f, 0x00, 0x00, 0xf0 } }, // D3DFMT_A4L4 (uses DXGI 1.2 format) -#else // !DXGI_1_2_FORMATS - { DXGI_FORMAT_R8G8B8A8_UNORM, CONV_FLAGS_EXPAND - | CONV_FLAGS_4444, DDSPF_A4R4G4B4 }, // D3DFMT_A4R4G4B4 - { DXGI_FORMAT_R8G8B8A8_UNORM, CONV_FLAGS_EXPAND - | CONV_FLAGS_NOALPHA - | CONV_FLAGS_4444, { sizeof(DDS_PIXELFORMAT), DDS_RGB, 0, 16, 0x0f00, 0x00f0, 0x000f, 0x0000 } }, // D3DFMT_X4R4G4B4 - { DXGI_FORMAT_R8G8B8A8_UNORM, CONV_FLAGS_EXPAND - | CONV_FLAGS_44, { sizeof(DDS_PIXELFORMAT), DDS_LUMINANCE, 0, 8, 0x0f, 0x00, 0x00, 0xf0 } }, // D3DFMT_A4L4 -#endif }; // Note that many common DDS reader/writers (including D3DX) swap the @@ -431,9 +421,7 @@ static HRESULT _DecodeDDSHeader( _In_reads_bytes_(size) LPCVOID pSource, size_t { case DXGI_FORMAT_B5G6R5_UNORM: case DXGI_FORMAT_B5G5R5A1_UNORM: -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: -#endif metadata.format = DXGI_FORMAT_R8G8B8A8_UNORM; convFlags |= CONV_FLAGS_EXPAND; if ( metadata.format == DXGI_FORMAT_B5G6R5_UNORM ) @@ -492,9 +480,7 @@ HRESULT _EncodeDDSHeader( const TexMetadata& metadata, DWORD flags, case DXGI_FORMAT_B5G5R5A1_UNORM: memcpy_s( &ddpf, sizeof(ddpf), &DDSPF_A1R5G5B5, sizeof(DDS_PIXELFORMAT) ); break; case DXGI_FORMAT_B8G8R8A8_UNORM: memcpy_s( &ddpf, sizeof(ddpf), &DDSPF_A8R8G8B8, sizeof(DDS_PIXELFORMAT) ); break; // DXGI 1.1 case DXGI_FORMAT_B8G8R8X8_UNORM: memcpy_s( &ddpf, sizeof(ddpf), &DDSPF_X8R8G8B8, sizeof(DDS_PIXELFORMAT) ); break; // DXGI 1.1 -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: memcpy_s( &ddpf, sizeof(ddpf), &DDSPF_A4R4G4B4, sizeof(DDS_PIXELFORMAT) ); break; -#endif // Legacy D3DX formats using D3DFMT enum value as FourCC case DXGI_FORMAT_R32G32B32A32_FLOAT: @@ -718,10 +704,8 @@ inline static TEXP_LEGACY_FORMAT _FindLegacyFormat( DWORD flags ) lformat = TEXP_LEGACY_A8R3G3B2; else if ( flags & CONV_FLAGS_44 ) lformat = TEXP_LEGACY_A4L4; -#ifndef DXGI_1_2_FORMATS else if ( flags & CONV_FLAGS_4444 ) lformat = TEXP_LEGACY_B4G4R4A4; -#endif else if ( flags & CONV_FLAGS_L8 ) lformat = TEXP_LEGACY_L8; else if ( flags & CONV_FLAGS_L16 ) @@ -885,7 +869,6 @@ static bool _LegacyExpandScanline( _Out_writes_bytes_(outSize) LPVOID pDestinati case TEXP_LEGACY_A4L4: switch( outFormat ) { -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM : // D3DFMT_A4L4 -> DXGI_FORMAT_B4G4R4A4_UNORM if ( inSize >= 1 && outSize >= 2 ) @@ -905,7 +888,6 @@ static bool _LegacyExpandScanline( _Out_writes_bytes_(outSize) LPVOID pDestinati return true; } return false; -#endif // DXGI_1_2_FORMATS case DXGI_FORMAT_R8G8B8A8_UNORM: // D3DFMT_A4L4 -> DXGI_FORMAT_R8G8B8A8_UNORM @@ -929,7 +911,6 @@ static bool _LegacyExpandScanline( _Out_writes_bytes_(outSize) LPVOID pDestinati } break; -#ifndef DXGI_1_2_FORMATS case TEXP_LEGACY_B4G4R4A4: if (outFormat != DXGI_FORMAT_R8G8B8A8_UNORM) return false; @@ -954,7 +935,6 @@ static bool _LegacyExpandScanline( _Out_writes_bytes_(outSize) LPVOID pDestinati return true; } return false; -#endif // DXGI_1_2_FORMATS case TEXP_LEGACY_L8: if (outFormat != DXGI_FORMAT_R8G8B8A8_UNORM) @@ -1127,11 +1107,7 @@ static HRESULT _CopyImage( _In_reads_bytes_(size) const void* pPixels, _In_ size { if ( convFlags & CONV_FLAGS_EXPAND ) { -#ifdef DXGI_1_2_FORMATS if ( convFlags & (CONV_FLAGS_565|CONV_FLAGS_5551|CONV_FLAGS_4444) ) -#else - if ( convFlags & (CONV_FLAGS_565|CONV_FLAGS_5551) ) -#endif { if ( !_ExpandScanline( pDest, dpitch, DXGI_FORMAT_R8G8B8A8_UNORM, pSrc, spitch, @@ -1205,11 +1181,7 @@ static HRESULT _CopyImage( _In_reads_bytes_(size) const void* pPixels, _In_ size { if ( convFlags & CONV_FLAGS_EXPAND ) { -#ifdef DXGI_1_2_FORMATS if ( convFlags & (CONV_FLAGS_565|CONV_FLAGS_5551|CONV_FLAGS_4444) ) -#else - if ( convFlags & (CONV_FLAGS_565|CONV_FLAGS_5551) ) -#endif { if ( !_ExpandScanline( pDest, dpitch, DXGI_FORMAT_R8G8B8A8_UNORM, pSrc, spitch, diff --git a/DirectXTex/DirectXTexP.h b/DirectXTex/DirectXTexP.h index 72ed375..7691705 100644 --- a/DirectXTex/DirectXTexP.h +++ b/DirectXTex/DirectXTexP.h @@ -19,18 +19,8 @@ #define NOMINMAX #include - -#ifndef _WIN32_WINNT_WIN8 -#define _WIN32_WINNT_WIN8 0x0602 -#endif - -#ifdef USE_XNAMATH -#include -#else #include #include -#endif - #include #include @@ -54,10 +44,6 @@ #include #pragma warning(pop) -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) && !defined(DXGI_1_2_FORMATS) -#define DXGI_1_2_FORMATS -#endif - #include "scoped.h" struct IWICImagingFactory; diff --git a/DirectXTex/DirectXTexUtil.cpp b/DirectXTex/DirectXTexUtil.cpp index 97e399d..168cdd8 100644 --- a/DirectXTex/DirectXTexUtil.cpp +++ b/DirectXTex/DirectXTexUtil.cpp @@ -395,12 +395,10 @@ size_t BitsPerPixel( DXGI_FORMAT fmt ) case DXGI_FORMAT_BC7_UNORM_SRGB: return 8; -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: return 16; // We don't support the video formats ( see IsVideo function ) -#endif // DXGI_1_2_FORMATS default: return 0; @@ -535,12 +533,10 @@ size_t BitsPerColor( DXGI_FORMAT fmt ) case DXGI_FORMAT_B5G5R5A1_UNORM: return 5; -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: return 4; // We don't support the video formats ( see IsVideo function ) -#endif // DXGI_1_2_FORMATS case DXGI_FORMAT_R1_UNORM: return 1; diff --git a/DirectXTex/DirectXTex_Desktop_2010.vcxproj b/DirectXTex/DirectXTex_Desktop_2010.vcxproj index 13deb6f..ac264f0 100644 --- a/DirectXTex/DirectXTex_Desktop_2010.vcxproj +++ b/DirectXTex/DirectXTex_Desktop_2010.vcxproj @@ -65,82 +65,70 @@ + + + + + + - Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\ - Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\ + Bin\Desktop_2010\$(Platform)\$(Configuration)\ + Bin\Desktop_2010\$(Platform)\$(Configuration)\ DirectXTex true true - $(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(LibraryPath) - Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\ - Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\ + Bin\Desktop_2010\$(Platform)\$(Configuration)\ + Bin\Desktop_2010\$(Platform)\$(Configuration)\ DirectXTex true true - $(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(LibraryPath) - Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\ - Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\ + Bin\Desktop_2010\$(Platform)\$(Configuration)\ + Bin\Desktop_2010\$(Platform)\$(Configuration)\ DirectXTex false true - $(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(LibraryPath) - Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\ - Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\ + Bin\Desktop_2010\$(Platform)\$(Configuration)\ + Bin\Desktop_2010\$(Platform)\$(Configuration)\ DirectXTex false true - $(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(LibraryPath) - Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\ - Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\ + Bin\Desktop_2010\$(Platform)\$(Configuration)\ + Bin\Desktop_2010\$(Platform)\$(Configuration)\ DirectXTex false true - $(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(LibraryPath) - Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\ - Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\ + Bin\Desktop_2010\$(Platform)\$(Configuration)\ + Bin\Desktop_2010\$(Platform)\$(Configuration)\ DirectXTex false true - $(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(LibraryPath) @@ -152,9 +140,8 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EditAndContinue EnableFastChecks Use @@ -194,9 +181,8 @@ true Fast Sync - ..\XNAMath;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EnableFastChecks Use DirectXTexP.h @@ -237,9 +223,8 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -280,9 +265,8 @@ true Fast Sync - ..\XNAMath;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -324,9 +308,8 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -367,9 +350,8 @@ true Fast Sync - ..\XNAMath;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb diff --git a/DirectXTex/DirectXTex_Desktop_2010_SDK81.sln b/DirectXTex/DirectXTex_Desktop_2010_SDK81.sln deleted file mode 100644 index edf2393..0000000 --- a/DirectXTex/DirectXTex_Desktop_2010_SDK81.sln +++ /dev/null @@ -1,31 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex_Desktop_2010_SDK81.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" -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 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/DirectXTex/DirectXTex_Desktop_2010_SDK81.vcxproj b/DirectXTex/DirectXTex_Desktop_2010_SDK81.vcxproj deleted file mode 100644 index 4466721..0000000 --- a/DirectXTex/DirectXTex_Desktop_2010_SDK81.vcxproj +++ /dev/null @@ -1,432 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Profile - Win32 - - - Profile - x64 - - - Release - Win32 - - - Release - x64 - - - - DirectXTex - {371B9FA9-4C90-4AC6-A123-ACED756D6C77} - DirectXTex - Win32Proj - - - - StaticLibrary - Unicode - - - StaticLibrary - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bin\Desktop_2010\$(Platform)\$(Configuration)\ - Bin\Desktop_2010\$(Platform)\$(Configuration)\ - DirectXTex - true - true - - - Bin\Desktop_2010\$(Platform)\$(Configuration)\ - Bin\Desktop_2010\$(Platform)\$(Configuration)\ - DirectXTex - true - true - - - Bin\Desktop_2010\$(Platform)\$(Configuration)\ - Bin\Desktop_2010\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - Bin\Desktop_2010\$(Platform)\$(Configuration)\ - Bin\Desktop_2010\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - Bin\Desktop_2010\$(Platform)\$(Configuration)\ - Bin\Desktop_2010\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - Bin\Desktop_2010\$(Platform)\$(Configuration)\ - Bin\Desktop_2010\$(Platform)\$(Configuration)\ - DirectXTex - false - true - - - - Level4 - Disabled - MultiThreadedDebugDLL - true - true - Fast - StreamingSIMDExtensions2 - Sync - %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;DXGI_1_2_FORMATS;_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 - - - - - - - - - - - - - Level4 - Disabled - MultiThreadedDebugDLL - true - true - Fast - Sync - %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;DXGI_1_2_FORMATS;_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 - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - StreamingSIMDExtensions2 - Sync - %(AdditionalOptions) - WIN32;NDEBUG;_WINDOWS;_LIB;DXGI_1_2_FORMATS;_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 - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - Sync - %(AdditionalOptions) - WIN32;NDEBUG;_WINDOWS;_LIB;DXGI_1_2_FORMATS;_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 - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - StreamingSIMDExtensions2 - Sync - %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;DXGI_1_2_FORMATS;_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 - - - - - - - - - - - - - Level4 - MaxSpeed - MultiThreadedDLL - true - true - true - Fast - Sync - %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;DXGI_1_2_FORMATS;_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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - \ No newline at end of file diff --git a/DirectXTex/DirectXTex_Desktop_2010_SDK81.vcxproj.filters b/DirectXTex/DirectXTex_Desktop_2010_SDK81.vcxproj.filters deleted file mode 100644 index ceb3b91..0000000 --- a/DirectXTex/DirectXTex_Desktop_2010_SDK81.vcxproj.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - -{8e114980-c1a3-4ada-ad7c-83caadf5daeb} -rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DirectXTex/DirectXTex_Desktop_2012.vcxproj b/DirectXTex/DirectXTex_Desktop_2012.vcxproj index 96188b4..35e324c 100644 --- a/DirectXTex/DirectXTex_Desktop_2012.vcxproj +++ b/DirectXTex/DirectXTex_Desktop_2012.vcxproj @@ -142,7 +142,7 @@ StreamingSIMDExtensions2 Sync %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EditAndContinue EnableFastChecks Use @@ -183,7 +183,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EnableFastChecks Use DirectXTexP.h @@ -225,7 +225,7 @@ StreamingSIMDExtensions2 Sync %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -267,7 +267,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -310,7 +310,7 @@ StreamingSIMDExtensions2 Sync %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -352,7 +352,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb diff --git a/DirectXTex/DirectXTex_Desktop_2013.vcxproj b/DirectXTex/DirectXTex_Desktop_2013.vcxproj index ef15e0d..777f0b1 100644 --- a/DirectXTex/DirectXTex_Desktop_2013.vcxproj +++ b/DirectXTex/DirectXTex_Desktop_2013.vcxproj @@ -142,7 +142,7 @@ StreamingSIMDExtensions2 Sync %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EditAndContinue EnableFastChecks Use @@ -183,7 +183,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EnableFastChecks Use DirectXTexP.h @@ -225,7 +225,7 @@ StreamingSIMDExtensions2 Sync %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -267,7 +267,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -310,7 +310,7 @@ StreamingSIMDExtensions2 Sync %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -352,7 +352,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;DXGI_1_2_FORMATS;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb diff --git a/DirectXTex/DirectXTex_Windows8.vcxproj b/DirectXTex/DirectXTex_Windows8.vcxproj index 58a66ac..db64c05 100644 --- a/DirectXTex/DirectXTex_Windows8.vcxproj +++ b/DirectXTex/DirectXTex_Windows8.vcxproj @@ -204,7 +204,7 @@ StreamingSIMDExtensions2 Sync %(AdditionalOptions) - _UNICODE;UNICODE;_DEBUG;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks Use DirectXTexP.h @@ -247,7 +247,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;_DEBUG;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks Use DirectXTexP.h @@ -289,7 +289,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;_DEBUG;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks Use DirectXTexP.h @@ -334,7 +334,7 @@ StreamingSIMDExtensions2 Sync %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -379,7 +379,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -423,7 +423,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -469,7 +469,7 @@ StreamingSIMDExtensions2 Sync %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -514,7 +514,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -558,7 +558,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb diff --git a/DirectXTex/DirectXTex_Windows81.vcxproj b/DirectXTex/DirectXTex_Windows81.vcxproj index f532a19..0d714eb 100644 --- a/DirectXTex/DirectXTex_Windows81.vcxproj +++ b/DirectXTex/DirectXTex_Windows81.vcxproj @@ -206,7 +206,7 @@ StreamingSIMDExtensions2 Sync %(AdditionalOptions) - _UNICODE;UNICODE;_DEBUG;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks Use DirectXTexP.h @@ -249,7 +249,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;_DEBUG;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks Use DirectXTexP.h @@ -291,7 +291,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;_DEBUG;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks Use DirectXTexP.h @@ -336,7 +336,7 @@ StreamingSIMDExtensions2 Sync %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -381,7 +381,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -425,7 +425,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -471,7 +471,7 @@ StreamingSIMDExtensions2 Sync %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -516,7 +516,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb @@ -560,7 +560,7 @@ Fast Sync %(AdditionalOptions) - _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;DXGI_1_2_FORMATS;%(PreprocessorDefinitions) + _UNICODE;UNICODE;NDEBUG;PROFILE;_LIB;%(PreprocessorDefinitions) Use DirectXTexP.h $(IntDir)$(TargetName).pdb diff --git a/DirectXTex/Filters.h b/DirectXTex/Filters.h index fa69e75..28bf417 100644 --- a/DirectXTex/Filters.h +++ b/DirectXTex/Filters.h @@ -15,12 +15,8 @@ #pragma once #endif -#ifdef USE_XNAMATH -#include -#else #include #include -#endif #include diff --git a/DirectXTex/scoped.h b/DirectXTex/scoped.h index 6c35817..5fb1b2f 100644 --- a/DirectXTex/scoped.h +++ b/DirectXTex/scoped.h @@ -24,11 +24,7 @@ struct aligned_deleter { void operator()(void* p) { _aligned_free(p); } }; typedef std::unique_ptr ScopedAlignedArrayFloat; -#ifdef USE_XNAMATH -typedef std::unique_ptr ScopedAlignedArrayXMVECTOR; -#else typedef std::unique_ptr ScopedAlignedArrayXMVECTOR; -#endif //--------------------------------------------------------------------------------- struct handle_closer { void operator()(HANDLE h) { assert(h != INVALID_HANDLE_VALUE); if (h) CloseHandle(h); } }; @@ -39,8 +35,6 @@ inline HANDLE safe_handle( HANDLE h ) { return (h == INVALID_HANDLE_VALUE) ? 0 : //--------------------------------------------------------------------------------- -#if defined(_MSC_VER) && (_MSC_VER >= 1610) - #include template class ScopedObject : public Microsoft::WRL::ComPtr @@ -50,70 +44,3 @@ public: ScopedObject( T *p ) : Microsoft::WRL::ComPtr(p) {} ScopedObject( const ScopedObject& other ) : Microsoft::WRL::ComPtr( other ) {} }; - -#else - -template class ScopedObject -{ -public: - ScopedObject() : _pointer(nullptr) {} - ScopedObject( T *p ) : _pointer(p) { if (_pointer) { _pointer->AddRef(); } } - ScopedObject( const ScopedObject& other ) : _pointer(other._pointer) { if (_pointer) { _pointer->AddRef(); } } - - ~ScopedObject() - { - if ( _pointer ) - { - _pointer->Release(); - _pointer = nullptr; - } - } - - operator bool() const { return (_pointer != nullptr); } - - ScopedObject& operator= (_In_opt_ T* other) - { - if ( _pointer != other ) - { - if ( _pointer) { _pointer->Release(); } - _pointer = other; - if ( other ) { other->AddRef(); }; - } - return *this; - } - - ScopedObject& operator= (const ScopedObject& other) - { - if ( _pointer != other._pointer ) - { - if ( _pointer) { _pointer->Release(); } - _pointer = other._pointer; - if ( other._pointer ) { other._pointer->AddRef(); } - } - return *this; - } - - T& operator*() { return *_pointer; } - - T* operator->() const { return _pointer; } - - T** operator&() { return &_pointer; } - - void Reset() { if ( _pointer ) { _pointer->Release(); _pointer = nullptr; } } - - T* Get() const { return _pointer; } - T** GetAddressOf() { return &_pointer; } - - T** ReleaseAndGetAddressOf() { if ( _pointer ) { _pointer->Release(); _pointer = nullptr; } return &_pointer; } - - template - HRESULT As(_Inout_ U* p) { return _pointer->QueryInterface( _uuidof(U), reinterpret_cast( p ) ); } - - template - HRESULT As(_Out_ ScopedObject* p ) { return _pointer->QueryInterface( _uuidof(U), reinterpret_cast( p->ReleaseAndGetAddressOf() ) ); } - -private: - T* _pointer; -}; - -#endif diff --git a/ScreenGrab/ScreenGrab.cpp b/ScreenGrab/ScreenGrab.cpp index 44e0517..e8b42e6 100644 --- a/ScreenGrab/ScreenGrab.cpp +++ b/ScreenGrab/ScreenGrab.cpp @@ -39,14 +39,6 @@ #include "ScreenGrab.h" -#ifndef _WIN32_WINNT_WIN8 -#define _WIN32_WINNT_WIN8 0x0602 -#endif - -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) && !defined(DXGI_1_2_FORMATS) -#define DXGI_1_2_FORMATS -#endif - //-------------------------------------------------------------------------------------- // Macros //-------------------------------------------------------------------------------------- @@ -357,10 +349,7 @@ static size_t BitsPerPixel( _In_ DXGI_FORMAT fmt ) case DXGI_FORMAT_R16_SINT: case DXGI_FORMAT_B5G6R5_UNORM: case DXGI_FORMAT_B5G5R5A1_UNORM: - -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: -#endif return 16; case DXGI_FORMAT_R8_TYPELESS: @@ -791,10 +780,7 @@ HRESULT DirectX::SaveDDSTextureToFile( _In_ ID3D11DeviceContext* pContext, case DXGI_FORMAT_B5G5R5A1_UNORM: memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_A1R5G5B5, sizeof(DDS_PIXELFORMAT) ); break; case DXGI_FORMAT_B8G8R8A8_UNORM: memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_A8R8G8B8, sizeof(DDS_PIXELFORMAT) ); break; // DXGI 1.1 case DXGI_FORMAT_B8G8R8X8_UNORM: memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_X8R8G8B8, sizeof(DDS_PIXELFORMAT) ); break; // DXGI 1.1 - -#ifdef DXGI_1_2_FORMATS case DXGI_FORMAT_B4G4R4A4_UNORM: memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_A4R4G4B4, sizeof(DDS_PIXELFORMAT) ); break; -#endif // Legacy D3DX formats using D3DFMT enum value as FourCC case DXGI_FORMAT_R32G32B32A32_FLOAT: header->ddspf.size = sizeof(DDS_PIXELFORMAT); header->ddspf.flags = DDS_FOURCC; header->ddspf.fourCC = 116; break; // D3DFMT_A32B32G32R32F diff --git a/Texassemble/Texassemble_Desktop_2010.vcxproj b/Texassemble/Texassemble_Desktop_2010.vcxproj index a3c8a37..a675056 100644 --- a/Texassemble/Texassemble_Desktop_2010.vcxproj +++ b/Texassemble/Texassemble_Desktop_2010.vcxproj @@ -65,64 +65,52 @@ + + + + + + true true - $(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(LibraryPath) true true - $(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(LibraryPath) false true - $(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(LibraryPath) false true - $(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(LibraryPath) false true - $(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(LibraryPath) false true - $(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(LibraryPath) @@ -134,9 +122,9 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EditAndContinue EnableFastChecks @@ -173,9 +161,9 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EnableFastChecks @@ -213,9 +201,9 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) %(AdditionalOptions) @@ -253,9 +241,9 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) %(AdditionalOptions) @@ -294,9 +282,9 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) %(AdditionalOptions) @@ -334,9 +322,9 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) %(AdditionalOptions) @@ -371,12 +359,10 @@ - + {371b9fa9-4c90-4ac6-a123-aced756d6c77} - - \ No newline at end of file diff --git a/Texassemble/Texassemble_Desktop_2010_SDK81.sln b/Texassemble/Texassemble_Desktop_2010_SDK81.sln deleted file mode 100644 index d1a1133..0000000 --- a/Texassemble/Texassemble_Desktop_2010_SDK81.sln +++ /dev/null @@ -1,45 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texassemble", "Texassemble_Desktop_2010_SDK81.vcxproj", "{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\DirectXTex\DirectXTex_Desktop_2010_SDK81.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" -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 - {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 - {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 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Texassemble/Texassemble_Desktop_2010_SDK81.vcxproj b/Texassemble/Texassemble_Desktop_2010_SDK81.vcxproj deleted file mode 100644 index a675056..0000000 --- a/Texassemble/Texassemble_Desktop_2010_SDK81.vcxproj +++ /dev/null @@ -1,368 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Profile - Win32 - - - Profile - x64 - - - Release - Win32 - - - Release - x64 - - - - texassemble - {8F18CBD7-4116-4956-BCD8-20D688A4CBD1} - texassemble - Win32Proj - - - - Application - Unicode - - - Application - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - - - true - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - 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_2010_SDK81.vcxproj.filters b/Texassemble/Texassemble_Desktop_2010_SDK81.vcxproj.filters deleted file mode 100644 index e999c41..0000000 --- a/Texassemble/Texassemble_Desktop_2010_SDK81.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 6692b0b..5e8f4a1 100644 --- a/Texassemble/texassemble.cpp +++ b/Texassemble/texassemble.cpp @@ -134,10 +134,8 @@ SValue g_pFormats[] = DEFFMT(B8G8R8A8_UNORM_SRGB), DEFFMT(B8G8R8X8_UNORM_SRGB), -#ifdef DXGI_1_2_FORMATS // DXGI 1.2 formats DEFFMT(B4G4R4A4_UNORM), -#endif { nullptr, DXGI_FORMAT_UNKNOWN } }; diff --git a/Texconv/Texconv_Desktop_2010.vcxproj b/Texconv/Texconv_Desktop_2010.vcxproj index 51adb67..a9d90a1 100644 --- a/Texconv/Texconv_Desktop_2010.vcxproj +++ b/Texconv/Texconv_Desktop_2010.vcxproj @@ -65,64 +65,52 @@ + + + + + + true true - $(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(LibraryPath) true true - $(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(LibraryPath) false true - $(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(LibraryPath) false true - $(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(LibraryPath) false true - $(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x86;$(LibraryPath) false true - $(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath) - $(DXSDK_DIR)Include;$(IncludePath) - $(DXSDK_DIR)Lib\x64;$(LibraryPath) @@ -134,9 +122,9 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EditAndContinue EnableFastChecks @@ -173,9 +161,9 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) EnableFastChecks @@ -213,9 +201,9 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) %(AdditionalOptions) @@ -253,9 +241,9 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) %(AdditionalOptions) @@ -294,9 +282,9 @@ Fast StreamingSIMDExtensions2 Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) %(AdditionalOptions) @@ -334,9 +322,9 @@ true Fast Sync - ..\XNAMath;..\DirectXTex;%(AdditionalIncludeDirectories) + ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) - WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;USE_XNAMATH;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) %(AdditionalOptions) @@ -371,12 +359,10 @@ - + {371b9fa9-4c90-4ac6-a123-aced756d6c77} - - \ No newline at end of file diff --git a/Texconv/Texconv_Desktop_2010_SDK81.sln b/Texconv/Texconv_Desktop_2010_SDK81.sln deleted file mode 100644 index 8708d72..0000000 --- a/Texconv/Texconv_Desktop_2010_SDK81.sln +++ /dev/null @@ -1,45 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texconv", "Texconv_Desktop_2010_SDK81.vcxproj", "{C3A65381-8FD3-4F69-B29E-654B4B0ED136}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\DirectXTex\DirectXTex_Desktop_2010_SDK81.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" -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 - {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 - {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 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Texconv/Texconv_Desktop_2010_SDK81.vcxproj b/Texconv/Texconv_Desktop_2010_SDK81.vcxproj deleted file mode 100644 index a9d90a1..0000000 --- a/Texconv/Texconv_Desktop_2010_SDK81.vcxproj +++ /dev/null @@ -1,368 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Profile - Win32 - - - Profile - x64 - - - Release - Win32 - - - Release - x64 - - - - texconv - {C3A65381-8FD3-4F69-B29E-654B4B0ED136} - texconv - Win32Proj - - - - Application - Unicode - - - Application - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - - - true - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - 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_2010_SDK81.vcxproj.filters b/Texconv/Texconv_Desktop_2010_SDK81.vcxproj.filters deleted file mode 100644 index 71d78bd..0000000 --- a/Texconv/Texconv_Desktop_2010_SDK81.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 48e052a..15291e1 100644 --- a/Texconv/texconv.cpp +++ b/Texconv/texconv.cpp @@ -179,10 +179,8 @@ SValue g_pFormats[] = DEFFMT(BC7_UNORM), DEFFMT(BC7_UNORM_SRGB), -#ifdef DXGI_1_2_FORMATS // DXGI 1.2 formats DEFFMT(B4G4R4A4_UNORM), -#endif { nullptr, DXGI_FORMAT_UNKNOWN } }; diff --git a/WICTextureLoader/WICTextureLoader.cpp b/WICTextureLoader/WICTextureLoader.cpp index 67185e6..2566455 100644 --- a/WICTextureLoader/WICTextureLoader.cpp +++ b/WICTextureLoader/WICTextureLoader.cpp @@ -40,14 +40,6 @@ #include "WICTextureLoader.h" -#ifndef _WIN32_WINNT_WIN8 -#define _WIN32_WINNT_WIN8 0x0602 -#endif - -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) && !defined(DXGI_1_2_FORMATS) -#define DXGI_1_2_FORMATS -#endif - #if defined(_DEBUG) || defined(PROFILE) #pragma comment(lib,"dxguid.lib") #endif @@ -162,13 +154,9 @@ static WICTranslate g_WICFormats[] = { GUID_WICPixelFormat32bppRGBA1010102XR, DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM }, // DXGI 1.1 { GUID_WICPixelFormat32bppRGBA1010102, DXGI_FORMAT_R10G10B10A2_UNORM }, -#ifdef DXGI_1_2_FORMATS - { GUID_WICPixelFormat16bppBGRA5551, DXGI_FORMAT_B5G5R5A1_UNORM }, { GUID_WICPixelFormat16bppBGR565, DXGI_FORMAT_B5G6R5_UNORM }, -#endif // DXGI_1_2_FORMATS - { GUID_WICPixelFormat32bppGrayFloat, DXGI_FORMAT_R32_FLOAT }, { GUID_WICPixelFormat16bppGrayHalf, DXGI_FORMAT_R16_FLOAT }, { GUID_WICPixelFormat16bppGray, DXGI_FORMAT_R16_UNORM }, @@ -204,18 +192,8 @@ static WICConvert g_WICConvert[] = { GUID_WICPixelFormat16bppGrayFixedPoint, GUID_WICPixelFormat16bppGrayHalf }, // DXGI_FORMAT_R16_FLOAT { GUID_WICPixelFormat32bppGrayFixedPoint, GUID_WICPixelFormat32bppGrayFloat }, // DXGI_FORMAT_R32_FLOAT -#ifdef DXGI_1_2_FORMATS - { GUID_WICPixelFormat16bppBGR555, GUID_WICPixelFormat16bppBGRA5551 }, // DXGI_FORMAT_B5G5R5A1_UNORM -#else - - { GUID_WICPixelFormat16bppBGR555, GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM - { GUID_WICPixelFormat16bppBGRA5551, GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM - { GUID_WICPixelFormat16bppBGR565, GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM - -#endif // DXGI_1_2_FORMATS - { GUID_WICPixelFormat32bppBGR101010, GUID_WICPixelFormat32bppRGBA1010102 }, // DXGI_FORMAT_R10G10B10A2_UNORM { GUID_WICPixelFormat24bppBGR, GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM