diff --git a/DXUT/Core/DXUT.h b/DXUT/Core/DXUT.h index 5ceee8b4..a55e71d8 100644 --- a/DXUT/Core/DXUT.h +++ b/DXUT/Core/DXUT.h @@ -131,7 +131,7 @@ ((DWORD)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) #endif -#define DXUT_VERSION 1119 +#define DXUT_VERSION 1120 //-------------------------------------------------------------------------------------- // Structs diff --git a/DXUT/Core/DXUT_2017_Win10.vcxproj b/DXUT/Core/DXUT_2017_Win10.vcxproj index a38949c5..399e6573 100644 --- a/DXUT/Core/DXUT_2017_Win10.vcxproj +++ b/DXUT/Core/DXUT_2017_Win10.vcxproj @@ -31,7 +31,7 @@ {85344B7F-5AA0-4e12-A065-D1333D11F6CA} DXUT Win32Proj - 10.0.16299.0 + 10.0.17134.0 @@ -132,11 +132,12 @@ MultiThreadedDebugDLL Fast StreamingSIMDExtensions2 - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true Windows @@ -160,10 +161,12 @@ Disabled MultiThreadedDebugDLL Fast + /Zc:__cplusplus %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true Windows @@ -187,11 +190,12 @@ MaxSpeed Fast StreamingSIMDExtensions2 - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true @@ -216,11 +220,12 @@ Level4 MaxSpeed Fast - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true @@ -246,11 +251,12 @@ MaxSpeed Fast StreamingSIMDExtensions2 - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true @@ -275,11 +281,12 @@ Level4 MaxSpeed Fast - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true diff --git a/DXUT/Core/DXUT_DirectXTK_2017_Win10.vcxproj b/DXUT/Core/DXUT_DirectXTK_2017_Win10.vcxproj index 72bb8721..9f60f74d 100644 --- a/DXUT/Core/DXUT_DirectXTK_2017_Win10.vcxproj +++ b/DXUT/Core/DXUT_DirectXTK_2017_Win10.vcxproj @@ -31,7 +31,7 @@ {85344B7F-5AA0-4e12-A065-D1333D11F6CA} DXUT Win32Proj - 10.0.16299.0 + 10.0.17134.0 @@ -133,11 +133,12 @@ Fast StreamingSIMDExtensions2 ..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true Windows @@ -162,11 +163,12 @@ MultiThreadedDebugDLL Fast ..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true Windows @@ -191,11 +193,12 @@ Fast StreamingSIMDExtensions2 ..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true @@ -221,11 +224,12 @@ MaxSpeed Fast ..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true @@ -252,11 +256,12 @@ Fast StreamingSIMDExtensions2 ..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true @@ -282,11 +287,12 @@ MaxSpeed Fast ..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true diff --git a/DXUT/Optional/DXUTOpt_2017_Win10.vcxproj b/DXUT/Optional/DXUTOpt_2017_Win10.vcxproj index 266ea19e..e559b019 100644 --- a/DXUT/Optional/DXUTOpt_2017_Win10.vcxproj +++ b/DXUT/Optional/DXUTOpt_2017_Win10.vcxproj @@ -31,7 +31,7 @@ {61B333C2-C4F7-4cc1-A9BF-83F6D95588EB} DXUTOpt Win32Proj - 10.0.16299.0 + 10.0.17134.0 @@ -133,11 +133,12 @@ Fast StreamingSIMDExtensions2 ..\Core\;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true Windows @@ -162,11 +163,12 @@ MultiThreadedDebugDLL Fast ..\Core\;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true Windows @@ -191,11 +193,12 @@ Fast StreamingSIMDExtensions2 ..\Core\;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true @@ -221,11 +224,12 @@ MaxSpeed Fast ..\Core\;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true @@ -252,11 +256,12 @@ Fast StreamingSIMDExtensions2 ..\Core\;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true @@ -282,11 +287,12 @@ MaxSpeed Fast ..\Core\;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true diff --git a/DXUT/Optional/DXUTOpt_DirectXTK_2017_Win10.vcxproj b/DXUT/Optional/DXUTOpt_DirectXTK_2017_Win10.vcxproj index 00ed2859..6d5e9a86 100644 --- a/DXUT/Optional/DXUTOpt_DirectXTK_2017_Win10.vcxproj +++ b/DXUT/Optional/DXUTOpt_DirectXTK_2017_Win10.vcxproj @@ -31,7 +31,7 @@ {61B333C2-C4F7-4cc1-A9BF-83F6D95588EB} DXUTOpt Win32Proj - 10.0.16299.0 + 10.0.17134.0 @@ -133,11 +133,12 @@ Fast StreamingSIMDExtensions2 ..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true Windows @@ -162,11 +163,12 @@ MultiThreadedDebugDLL Fast ..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true Windows @@ -191,11 +193,12 @@ Fast StreamingSIMDExtensions2 ..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true @@ -221,11 +224,12 @@ MaxSpeed Fast ..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true @@ -252,11 +256,12 @@ Fast StreamingSIMDExtensions2 ..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true @@ -282,11 +287,12 @@ MaxSpeed Fast ..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories) - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use DXUT.h + true true diff --git a/DXUT/ReadMe.txt b/DXUT/ReadMe.txt index 97066d11..cc888f0d 100644 --- a/DXUT/ReadMe.txt +++ b/DXUT/ReadMe.txt @@ -3,15 +3,15 @@ DXUT FOR DIRECT3D 11 Copyright (c) Microsoft Corporation. All rights reserved. -May 11, 2018 +May 31, 2018 DXUT is a "GLUT"-like framework for Direct3D 11.x Win32 desktop applications; primarily samples, demos, and prototypes. 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). +Windows 10 Anniversary Update SDK (14393) or VS 2017 (15.7 update) or later with the +Windows 10 April 2018 Update SDK (17134). These components are designed to work without requiring any content from the DirectX SDK. For details, see "Where is the DirectX SDK?" . @@ -60,13 +60,17 @@ RELEASE NOTES * The VS 2017 projects make use of /permissive- for improved C++ standard conformance. Use of a Windows 10 SDK prior to the Fall Creators Update (16299) may result in failures due to problems with the system headers. You can work around - these by deleting /permissive- from the project files which is found in the element. + these by disabling this switch in the project files which is found in the or + elements. --------------- RELEASE HISTORY --------------- +May 31, 2018 + VS 2017 updated for Windows 10 April 2018 Update SDK (17134) + May 11, 2018 (11.19) Support for Direct3D 11.2 no longer requires define USE_DIRECT3D11_2 Retired VS 2013 projects diff --git a/DirectXTK/Audio/DirectXTKAudio_Desktop_2017_Win8.vcxproj b/DirectXTK/Audio/DirectXTKAudio_Desktop_2017_Win8.vcxproj index 3e512342..49039f3b 100644 --- a/DirectXTK/Audio/DirectXTKAudio_Desktop_2017_Win8.vcxproj +++ b/DirectXTK/Audio/DirectXTKAudio_Desktop_2017_Win8.vcxproj @@ -43,7 +43,7 @@ {4F150A30-CECB-49D1-8283-6A3F57438CF5} Win32Proj DirectXTKAudio - 10.0.16299.0 + 10.0.17134.0 @@ -117,8 +117,9 @@ Fast $(IntDir)$(TargetName).pdb pch.h + true true - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) Windows @@ -135,8 +136,9 @@ Fast $(IntDir)$(TargetName).pdb pch.h + true true - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) Windows @@ -154,8 +156,9 @@ Fast $(IntDir)$(TargetName).pdb pch.h + true true - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) Windows @@ -174,8 +177,9 @@ Fast $(IntDir)$(TargetName).pdb pch.h + true true - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) Windows diff --git a/DirectXTK/DirectXTK_Desktop_2017.vcxproj b/DirectXTK/DirectXTK_Desktop_2017.vcxproj index 10b4380d..b23a858d 100644 --- a/DirectXTK/DirectXTK_Desktop_2017.vcxproj +++ b/DirectXTK/DirectXTK_Desktop_2017.vcxproj @@ -493,7 +493,7 @@ {E0B52AE7-E160-4D32-BF3F-910B785E5A8E} Win32Proj DirectXTK - 10.0.16299.0 + 10.0.17134.0 @@ -567,7 +567,8 @@ Fast $(IntDir)$(TargetName).pdb true - /permissive- %(AdditionalOptions) + true + /Zc:__cplusplus %(AdditionalOptions) Windows @@ -586,7 +587,8 @@ StreamingSIMDExtensions2 $(IntDir)$(TargetName).pdb true - /permissive- %(AdditionalOptions) + true + /Zc:__cplusplus %(AdditionalOptions) Windows @@ -604,7 +606,8 @@ Fast $(IntDir)$(TargetName).pdb true - /permissive- %(AdditionalOptions) + true + /Zc:__cplusplus %(AdditionalOptions) Windows @@ -625,7 +628,8 @@ StreamingSIMDExtensions2 $(IntDir)$(TargetName).pdb true - /permissive- %(AdditionalOptions) + true + /Zc:__cplusplus %(AdditionalOptions) Windows diff --git a/DirectXTK/DirectXTK_Desktop_2017_Win10.vcxproj b/DirectXTK/DirectXTK_Desktop_2017_Win10.vcxproj index fef5d673..15174462 100644 --- a/DirectXTK/DirectXTK_Desktop_2017_Win10.vcxproj +++ b/DirectXTK/DirectXTK_Desktop_2017_Win10.vcxproj @@ -505,7 +505,7 @@ {E0B52AE7-E160-4D32-BF3F-910B785E5A8E} Win32Proj DirectXTK - 10.0.16299.0 + 10.0.17134.0 @@ -578,8 +578,9 @@ $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) Fast $(IntDir)$(TargetName).pdb + true true - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) Windows @@ -597,8 +598,9 @@ Fast StreamingSIMDExtensions2 $(IntDir)$(TargetName).pdb + true true - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) Windows @@ -615,8 +617,9 @@ $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) Fast $(IntDir)$(TargetName).pdb + true true - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) Windows @@ -636,8 +639,9 @@ Fast StreamingSIMDExtensions2 $(IntDir)$(TargetName).pdb + true true - /permissive- %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) Windows diff --git a/DirectXTK/Readme.txt b/DirectXTK/Readme.txt index 856d0eab..e2aa39fc 100644 --- a/DirectXTK/Readme.txt +++ b/DirectXTK/Readme.txt @@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 11 Copyright (c) Microsoft Corporation. All rights reserved. -May 14, 2018 +May 31, 2018 This package contains the "DirectX Tool Kit", a collection of helper classes for writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10, @@ -14,8 +14,8 @@ Windows Vista Service Pack 2 Direct3D 11.0 applications. 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). +Windows 10 Anniversary Update SDK (14393) or VS 2017 (15.7 update) or later with the +Windows 10 April 2018 Update SDK (17134). These components are designed to work without requiring any content from the DirectX SDK. For details, see "Where is the DirectX SDK?" . @@ -84,14 +84,18 @@ RELEASE NOTES * The VS 2017 projects make use of /permissive- for improved C++ standard conformance. Use of a Windows 10 SDK prior to the Fall Creators Update (16299) or an Xbox One XDK prior to June 2017 QFE 4 may result in failures due to problems - with the system headers. You can work around these by deleting /permissive- from the project files which is found - in the element. + with the system headers. You can work around these by disabling this switch in the project files which is found + in the or elements. --------------- RELEASE HISTORY --------------- +May 31, 2018 + VS 2017 updated for Windows 10 April 2018 Update SDK (17134) + Regenerated shaders using Windows 10 April 2018 Update SDK (17134) + May 14, 2018 Updated for VS 2017 15.7 update warnings Code and project cleanup @@ -124,6 +128,7 @@ December 13, 2017 November 1, 2017 VS 2017 updated for Windows 10 Fall Creators Update SDK (16299) + Regenerated shaders using Windows 10 Fall Creators Update SDK (16299) September 22, 2017 Updated for VS 2017 15.3 update /permissive- changes diff --git a/DirectXTK/Src/AlphaTestEffect.cpp b/DirectXTK/Src/AlphaTestEffect.cpp index f5a77c7f..ca19c8dd 100644 --- a/DirectXTK/Src/AlphaTestEffect.cpp +++ b/DirectXTK/Src/AlphaTestEffect.cpp @@ -29,7 +29,7 @@ static_assert((sizeof(AlphaTestEffectConstants) % 16) == 0, "CB size not padded // Traits type describes our characteristics to the EffectBase template. struct AlphaTestEffectTraits { - typedef AlphaTestEffectConstants ConstantBufferType; + using ConstantBufferType = AlphaTestEffectConstants; static const int VertexShaderCount = 4; static const int PixelShaderCount = 4; diff --git a/DirectXTK/Src/BasicEffect.cpp b/DirectXTK/Src/BasicEffect.cpp index d56f8e6b..ee81c823 100644 --- a/DirectXTK/Src/BasicEffect.cpp +++ b/DirectXTK/Src/BasicEffect.cpp @@ -40,7 +40,7 @@ static_assert((sizeof(BasicEffectConstants) % 16) == 0, "CB size not padded corr // Traits type describes our characteristics to the EffectBase template. struct BasicEffectTraits { - typedef BasicEffectConstants ConstantBufferType; + using ConstantBufferType = BasicEffectConstants; static const int VertexShaderCount = 32; static const int PixelShaderCount = 10; diff --git a/DirectXTK/Src/DebugEffect.cpp b/DirectXTK/Src/DebugEffect.cpp index 064eb4cf..182e727b 100644 --- a/DirectXTK/Src/DebugEffect.cpp +++ b/DirectXTK/Src/DebugEffect.cpp @@ -30,7 +30,7 @@ static_assert((sizeof(DebugEffectConstants) % 16) == 0, "CB size not padded corr // Traits type describes our characteristics to the EffectBase template. struct DebugEffectTraits { - typedef DebugEffectConstants ConstantBufferType; + using ConstantBufferType = DebugEffectConstants; static const int VertexShaderCount = 4; static const int PixelShaderCount = 4; @@ -346,4 +346,4 @@ void DebugEffect::SetVertexColorEnabled(bool value) void DebugEffect::SetBiasedVertexNormals(bool value) { pImpl->biasedVertexNormals = value; -} \ No newline at end of file +} diff --git a/DirectXTK/Src/DualTextureEffect.cpp b/DirectXTK/Src/DualTextureEffect.cpp index 8109732a..4443737e 100644 --- a/DirectXTK/Src/DualTextureEffect.cpp +++ b/DirectXTK/Src/DualTextureEffect.cpp @@ -29,7 +29,7 @@ static_assert((sizeof(DualTextureEffectConstants) % 16) == 0, "CB size not padde // Traits type describes our characteristics to the EffectBase template. struct DualTextureEffectTraits { - typedef DualTextureEffectConstants ConstantBufferType; + using ConstantBufferType = DualTextureEffectConstants; static const int VertexShaderCount = 4; static const int PixelShaderCount = 2; diff --git a/DirectXTK/Src/EnvironmentMapEffect.cpp b/DirectXTK/Src/EnvironmentMapEffect.cpp index 52c0a5c6..820d48bc 100644 --- a/DirectXTK/Src/EnvironmentMapEffect.cpp +++ b/DirectXTK/Src/EnvironmentMapEffect.cpp @@ -44,7 +44,7 @@ static_assert((sizeof(EnvironmentMapEffectConstants) % 16) == 0, "CB size not pa // Traits type describes our characteristics to the EffectBase template. struct EnvironmentMapEffectTraits { - typedef EnvironmentMapEffectConstants ConstantBufferType; + using ConstantBufferType = EnvironmentMapEffectConstants; static const int VertexShaderCount = 10; static const int PixelShaderCount = 8; diff --git a/DirectXTK/Src/NormalMapEffect.cpp b/DirectXTK/Src/NormalMapEffect.cpp index 478a4e67..0616bdea 100644 --- a/DirectXTK/Src/NormalMapEffect.cpp +++ b/DirectXTK/Src/NormalMapEffect.cpp @@ -40,7 +40,7 @@ static_assert((sizeof(NormalMapEffectConstants) % 16) == 0, "CB size not padded // Traits type describes our characteristics to the EffectBase template. struct NormalMapEffectTraits { - typedef NormalMapEffectConstants ConstantBufferType; + using ConstantBufferType = NormalMapEffectConstants; static const int VertexShaderCount = 4; static const int PixelShaderCount = 4; @@ -504,4 +504,4 @@ void NormalMapEffect::SetSpecularTexture(_In_opt_ ID3D11ShaderResourceView* valu void NormalMapEffect::SetBiasedVertexNormals(bool value) { pImpl->biasedVertexNormals = value; -} \ No newline at end of file +} diff --git a/DirectXTK/Src/PBREffect.cpp b/DirectXTK/Src/PBREffect.cpp index cb7eb345..db2259f4 100644 --- a/DirectXTK/Src/PBREffect.cpp +++ b/DirectXTK/Src/PBREffect.cpp @@ -42,7 +42,7 @@ static_assert((sizeof(PBREffectConstants) % 16) == 0, "CB size not padded correc // Traits type describes our characteristics to the EffectBase template. struct PBREffectTraits { - typedef PBREffectConstants ConstantBufferType; + using ConstantBufferType = PBREffectConstants; static const int VertexShaderCount = 4; static const int PixelShaderCount = 5; diff --git a/DirectXTK/Src/SkinnedEffect.cpp b/DirectXTK/Src/SkinnedEffect.cpp index fac0c11b..177a7948 100644 --- a/DirectXTK/Src/SkinnedEffect.cpp +++ b/DirectXTK/Src/SkinnedEffect.cpp @@ -42,7 +42,7 @@ static_assert((sizeof(SkinnedEffectConstants) % 16) == 0, "CB size not padded co // Traits type describes our characteristics to the EffectBase template. struct SkinnedEffectTraits { - typedef SkinnedEffectConstants ConstantBufferType; + using ConstantBufferType = SkinnedEffectConstants; static const int VertexShaderCount = 18; static const int PixelShaderCount = 3; diff --git a/DirectXTex/DirectXTexImage.cpp b/DirectXTex/DirectXTexImage.cpp index d57d0397..8067fbdd 100644 --- a/DirectXTex/DirectXTexImage.cpp +++ b/DirectXTex/DirectXTexImage.cpp @@ -764,7 +764,7 @@ bool ScratchImage::IsAlphaAllOpaque() const if (!scanline) return false; - static const XMVECTORF32 threshold = { { { 0.99f, 0.99f, 0.99f, 0.99f } } }; + static const XMVECTORF32 threshold = { { { 0.997f, 0.997f, 0.997f, 0.997f } } }; for (size_t index = 0; index < m_nimages; ++index) { diff --git a/DirectXTex/ReadMe.txt b/DirectXTex/ReadMe.txt index 405efab3..6dbb44c7 100644 --- a/DirectXTex/ReadMe.txt +++ b/DirectXTex/ReadMe.txt @@ -3,7 +3,7 @@ DIRECTX TEXTURE LIBRARY (DirectXTex) Copyright (c) Microsoft Corporation. All rights reserved. -May 11, 2018 +May 31, 2018 This package contains DirectXTex, a shared source library for reading and writing DDS files, and performing various texture content processing operations including @@ -15,8 +15,8 @@ processing pipelines, but are not currently supported by a built-in WIC codec. 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). +Windows 10 Anniversary Update SDK (14393) or VS 2017 (15.7 update) or later with the +Windows 10 April 2018 Update SDK (17134). DirectXTex\ This contains the DirectXTex library. This includes a full-featured DDS reader and writer @@ -122,13 +122,17 @@ RELEASE NOTES * The VS 2017 projects make use of /permissive- for improved C++ standard conformance. Use of a Windows 10 SDK prior to the Fall Creators Update (16299) or an Xbox One XDK prior to June 2017 QFE 4 may result in failures due to problems - with the system headers. You can work around these by deleting /permissive- from the project files which is found - in the element. + with the system headers. You can work around these by disabling this switch in the project files which is found + in the or elements. ------------------------------------ RELEASE HISTORY +May 31, 2018 + Fix for IsAlphaAllOpaque for 'near opaque' values + VS 2017 updated for Windows 10 April 2018 Update SDK (17134) + May 11, 2018 Workaround for WIC issue doing FP32->FP16 conversions Updated for VS 2017 15.7 update warnings diff --git a/Effects11/Effects11_2017_Win10.vcxproj b/Effects11/Effects11_2017_Win10.vcxproj index 6418f87b..30998da8 100644 --- a/Effects11/Effects11_2017_Win10.vcxproj +++ b/Effects11/Effects11_2017_Win10.vcxproj @@ -31,7 +31,7 @@ {DF460EAB-570D-4B50-9089-2E2FC801BF38} Effects11 Win32Proj - 10.0.16299.0 + 10.0.17134.0 @@ -127,6 +127,7 @@ pchfx.h _WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use + /Zc:__cplusplus %(AdditionalOptions) Windows @@ -155,6 +156,7 @@ pchfx.h _WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use + /Zc:__cplusplus %(AdditionalOptions) Windows @@ -183,6 +185,7 @@ pchfx.h _WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use + /Zc:__cplusplus %(AdditionalOptions) true @@ -212,6 +215,7 @@ pchfx.h _WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use + /Zc:__cplusplus %(AdditionalOptions) true @@ -242,6 +246,7 @@ pchfx.h _WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use + /Zc:__cplusplus %(AdditionalOptions) true @@ -271,6 +276,7 @@ pchfx.h _WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use + /Zc:__cplusplus %(AdditionalOptions) true diff --git a/Effects11/ReadMe.txt b/Effects11/ReadMe.txt index b5f948a5..72939a09 100644 --- a/Effects11/ReadMe.txt +++ b/Effects11/ReadMe.txt @@ -3,15 +3,15 @@ EFFECTS FOR DIRECT3D 11 (FX11) Copyright (c) Microsoft Corporation. All rights reserved. -May 11, 2018 +May 31, 2018 Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render state, and runtime variables together. 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). +Windows 10 Anniversary Update SDK (14393) or VS 2017 (15.7 update) or later with the +Windows 10 April 2018 Update SDK (17134). These components are designed to work without requiring any content from the DirectX SDK. For details, see "Where is the DirectX SDK?" . @@ -62,6 +62,9 @@ in a future update. RELEASE HISTORY --------------- +May 31, 2018 (11.24) + VS 2017 updated for Windows 10 April 2018 Update SDK (17134) + May 11, 2018 (11.23) Retired VS 2013 projects Code cleanup diff --git a/Effects11/inc/d3dx11effect.h b/Effects11/inc/d3dx11effect.h index 0ecbb7ad..c83b5c52 100644 --- a/Effects11/inc/d3dx11effect.h +++ b/Effects11/inc/d3dx11effect.h @@ -11,7 +11,7 @@ #pragma once -#define D3DX11_EFFECTS_VERSION 1123 +#define D3DX11_EFFECTS_VERSION 1124 #if defined(_XBOX_ONE) && defined(_TITLE) #include