diff --git a/BuildAllSolutions.targets b/BuildAllSolutions.targets new file mode 100644 index 00000000..5a9282d6 --- /dev/null +++ b/BuildAllSolutions.targets @@ -0,0 +1,22 @@ + + + + + + + + + + + <_OneSln>%(FullSolutionList.Identity) + + + + + + + + \ No newline at end of file diff --git a/DXUT/Core/DDSTextureLoader.cpp b/DXUT/Core/DDSTextureLoader.cpp index 5a7e77df..29db8fa2 100644 --- a/DXUT/Core/DDSTextureLoader.cpp +++ b/DXUT/Core/DDSTextureLoader.cpp @@ -45,7 +45,7 @@ using namespace DirectX; //-------------------------------------------------------------------------------------- #pragma pack(push,1) -const uint32_t DDS_MAGIC = 0x20534444; // "DDS " +constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS " struct DDS_PIXELFORMAT { @@ -162,7 +162,7 @@ namespace } // DDS files always start with the same magic number ("DDS ") - auto dwMagicNumber = *reinterpret_cast(ddsData); + auto const dwMagicNumber = *reinterpret_cast(ddsData); if (dwMagicNumber != DDS_MAGIC) { return E_FAIL; @@ -286,7 +286,7 @@ namespace } // DDS files always start with the same magic number ("DDS ") - auto dwMagicNumber = *reinterpret_cast(ddsData.get()); + auto const dwMagicNumber = *reinterpret_cast(ddsData.get()); if (dwMagicNumber != DDS_MAGIC) { ddsData.reset(); @@ -592,7 +592,7 @@ namespace } else { - size_t bpp = BitsPerPixel(fmt); + const size_t bpp = BitsPerPixel(fmt); if (!bpp) return E_INVALIDARG; @@ -1043,7 +1043,7 @@ namespace _In_ unsigned int miscFlags, _In_ bool forceSRGB, _In_ bool isCubeMap, - _In_reads_opt_(mipCount*arraySize) D3D11_SUBRESOURCE_DATA* initData, + _In_reads_opt_(mipCount*arraySize) const D3D11_SUBRESOURCE_DATA* initData, _Outptr_opt_ ID3D11Resource** texture, _Outptr_opt_ ID3D11ShaderResourceView** textureView) noexcept { @@ -1279,7 +1279,7 @@ namespace { HRESULT hr = S_OK; - UINT width = header->width; + const UINT width = header->width; UINT height = header->height; UINT depth = header->depth; @@ -1531,7 +1531,7 @@ namespace return HRESULT_FROM_WIN32(ERROR_HANDLE_EOF); } - UINT res = D3D11CalcSubresource(0, item, mipLevels); + const UINT res = D3D11CalcSubresource(0, item, mipLevels); d3dContext->UpdateSubresource(tex, res, nullptr, pSrcBits, static_cast(rowBytes), static_cast(numBytes)); pSrcBits += numBytes; } @@ -1642,7 +1642,7 @@ namespace if (MAKEFOURCC('D', 'X', '1', '0') == header->ddspf.fourCC) { auto d3d10ext = reinterpret_cast(reinterpret_cast(header) + sizeof(DDS_HEADER)); - auto mode = static_cast(d3d10ext->miscFlags2 & DDS_MISC_FLAGS2_ALPHA_MODE_MASK); + auto const mode = static_cast(d3d10ext->miscFlags2 & DDS_MISC_FLAGS2_ALPHA_MODE_MASK); switch (mode) { case DDS_ALPHA_MODE_STRAIGHT: @@ -1676,7 +1676,7 @@ namespace if (texture || textureView) { CHAR strFileA[MAX_PATH]; - int result = WideCharToMultiByte(CP_UTF8, + const int result = WideCharToMultiByte(CP_UTF8, WC_NO_BEST_FIT_CHARS, fileName, -1, diff --git a/DXUT/Core/DXUT.cpp b/DXUT/Core/DXUT.cpp index 30db403d..a378c21c 100644 --- a/DXUT/Core/DXUT.cpp +++ b/DXUT/Core/DXUT.cpp @@ -4476,7 +4476,7 @@ HRESULT DXUTSnapDeviceSettingsToEnumDevice( DXUTDeviceSettings* pDeviceSettings, } if (pDeviceSettingsCombo->pOutputInfo) { - const auto& bestDisplayMode = pDeviceSettingsCombo->pOutputInfo->displayModeList[ bestModeIndex ]; + auto const& bestDisplayMode = pDeviceSettingsCombo->pOutputInfo->displayModeList[ bestModeIndex ]; if (!pDeviceSettingsCombo->Windowed) { pDeviceSettings->d3d11.sd.BufferDesc.Height = bestDisplayMode.Height; diff --git a/DXUT/Core/DXUTDevice11.cpp b/DXUT/Core/DXUTDevice11.cpp index d6d4589f..e7dc4bc2 100644 --- a/DXUT/Core/DXUTDevice11.cpp +++ b/DXUT/Core/DXUTDevice11.cpp @@ -1113,7 +1113,7 @@ float DXUTRankD3D11DeviceCombo( CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCo // Match both Resolution & Refresh Rate for( size_t idm = 0; idm < pDeviceSettingsCombo->pOutputInfo->displayModeList.size() && !bResolutionFound; idm++ ) { - const auto& displayMode = pDeviceSettingsCombo->pOutputInfo->displayModeList[ idm ]; + auto const& displayMode = pDeviceSettingsCombo->pOutputInfo->displayModeList[ idm ]; float refreshDiff = fabsf( ( float( displayMode.RefreshRate.Numerator ) / float( displayMode.RefreshRate.Denominator ) ) - ( float( pOptimalDeviceSettings->sd.BufferDesc.RefreshRate.Numerator ) / float( pOptimalDeviceSettings->sd.BufferDesc.RefreshRate.Denominator ) ) ); @@ -1143,7 +1143,7 @@ float DXUTRankD3D11DeviceCombo( CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCo // Match just Resolution for( size_t idm = 0; idm < pDeviceSettingsCombo->pOutputInfo->displayModeList.size() && !bResolutionFound; idm++ ) { - const auto& displayMode = pDeviceSettingsCombo->pOutputInfo->displayModeList[ idm ]; + auto const& displayMode = pDeviceSettingsCombo->pOutputInfo->displayModeList[ idm ]; if( displayMode.Width == pOptimalDeviceSettings->sd.BufferDesc.Width && displayMode.Height == pOptimalDeviceSettings->sd.BufferDesc.Height ) diff --git a/DXUT/Core/DXUT_2019_Win10.vcxproj b/DXUT/Core/DXUT_2019_Win10.vcxproj index 60fe30ce..3b72b50d 100644 --- a/DXUT/Core/DXUT_2019_Win10.vcxproj +++ b/DXUT/Core/DXUT_2019_Win10.vcxproj @@ -134,7 +134,7 @@ MultiThreadedDebugDLL Fast StreamingSIMDExtensions2 - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -165,7 +165,7 @@ Disabled MultiThreadedDebugDLL Fast - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -196,7 +196,7 @@ MaxSpeed Fast StreamingSIMDExtensions2 - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -226,7 +226,7 @@ Level4 MaxSpeed Fast - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -257,7 +257,7 @@ MaxSpeed Fast StreamingSIMDExtensions2 - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -287,7 +287,7 @@ Level4 MaxSpeed Fast - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use diff --git a/DXUT/Core/DXUT_DirectXTK_2019_Win10.vcxproj b/DXUT/Core/DXUT_DirectXTK_2019_Win10.vcxproj index ab2810ff..17e6de79 100644 --- a/DXUT/Core/DXUT_DirectXTK_2019_Win10.vcxproj +++ b/DXUT/Core/DXUT_DirectXTK_2019_Win10.vcxproj @@ -135,7 +135,7 @@ Fast StreamingSIMDExtensions2 ..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -167,7 +167,7 @@ MultiThreadedDebugDLL Fast ..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -199,7 +199,7 @@ Fast StreamingSIMDExtensions2 ..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -230,7 +230,7 @@ MaxSpeed Fast ..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -262,7 +262,7 @@ Fast StreamingSIMDExtensions2 ..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -293,7 +293,7 @@ MaxSpeed Fast ..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use diff --git a/DXUT/Core/ScreenGrab.cpp b/DXUT/Core/ScreenGrab.cpp index b18d91e1..92e308ee 100644 --- a/DXUT/Core/ScreenGrab.cpp +++ b/DXUT/Core/ScreenGrab.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -214,7 +215,7 @@ namespace { FILE_DISPOSITION_INFO info = {}; info.DeleteFile = TRUE; - (void)SetFileInformationByHandle(m_handle, FileDispositionInfo, &info, sizeof(info)); + std::ignore = SetFileInformationByHandle(m_handle, FileDispositionInfo, &info, sizeof(info)); } } @@ -555,7 +556,7 @@ namespace } else { - size_t bpp = BitsPerPixel(fmt); + const size_t bpp = BitsPerPixel(fmt); if (!bpp) return E_INVALIDARG; @@ -660,7 +661,7 @@ namespace assert(pTemp); - DXGI_FORMAT fmt = EnsureNotTypeless(desc.Format); + const DXGI_FORMAT fmt = EnsureNotTypeless(desc.Format); UINT support = 0; hr = d3dDevice->CheckFormatSupport(fmt, &support); @@ -674,7 +675,7 @@ namespace { for (UINT level = 0; level < desc.MipLevels; ++level) { - UINT index = D3D11CalcSubresource(level, item, desc.MipLevels); + const UINT index = D3D11CalcSubresource(level, item, desc.MipLevels); pContext->ResolveSubresource(pTemp.Get(), index, pSource, index, fmt); } } @@ -758,7 +759,7 @@ namespace #endif } - IWICImagingFactory* _GetWIC() noexcept + IWICImagingFactory* GetWIC() noexcept { static INIT_ONCE s_initOnce = INIT_ONCE_STATIC_INIT; @@ -806,7 +807,7 @@ HRESULT DirectX::SaveDDSTextureToFile( auto_delete_file delonfail(hFile.get()); // Setup header - const size_t MAX_HEADER_SIZE = sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10); + constexpr size_t MAX_HEADER_SIZE = sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10); uint8_t fileHeader[MAX_HEADER_SIZE] = {}; *reinterpret_cast(&fileHeader[0]) = DDS_MAGIC; @@ -914,7 +915,7 @@ HRESULT DirectX::SaveDDSTextureToFile( uint8_t* dptr = pixels.get(); - size_t msize = std::min(rowPitch, mapped.RowPitch); + const size_t msize = std::min(rowPitch, mapped.RowPitch); for (size_t h = 0; h < rowCount; ++h) { memcpy_s(dptr, rowPitch, sptr, msize); @@ -1012,7 +1013,7 @@ HRESULT DirectX::SaveWICTextureToFile( return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); } - auto pWIC = _GetWIC(); + auto pWIC = GetWIC(); if (!pWIC) return E_NOINTERFACE; @@ -1051,7 +1052,7 @@ HRESULT DirectX::SaveWICTextureToFile( VARIANT varValue; varValue.vt = VT_BOOL; varValue.boolVal = VARIANT_TRUE; - (void)props->Write(1, &option, &varValue); + std::ignore = props->Write(1, &option, &varValue); } if (setCustomProps) @@ -1137,37 +1138,37 @@ HRESULT DirectX::SaveWICTextureToFile( if (memcmp(&guidContainerFormat, &GUID_ContainerFormatPng, sizeof(GUID)) == 0) { // Set Software name - (void)metawriter->SetMetadataByName(L"/tEXt/{str=Software}", &value); + std::ignore = metawriter->SetMetadataByName(L"/tEXt/{str=Software}", &value); // Set sRGB chunk if (sRGB) { value.vt = VT_UI1; value.bVal = 0; - (void)metawriter->SetMetadataByName(L"/sRGB/RenderingIntent", &value); + std::ignore = metawriter->SetMetadataByName(L"/sRGB/RenderingIntent", &value); } else { // add gAMA chunk with gamma 1.0 value.vt = VT_UI4; value.uintVal = 100000; // gama value * 100,000 -- i.e. gamma 1.0 - (void)metawriter->SetMetadataByName(L"/gAMA/ImageGamma", &value); + std::ignore = metawriter->SetMetadataByName(L"/gAMA/ImageGamma", &value); // remove sRGB chunk which is added by default. - (void)metawriter->RemoveMetadataByName(L"/sRGB/RenderingIntent"); + std::ignore = metawriter->RemoveMetadataByName(L"/sRGB/RenderingIntent"); } } else { // Set Software name - (void)metawriter->SetMetadataByName(L"System.ApplicationName", &value); + std::ignore = metawriter->SetMetadataByName(L"System.ApplicationName", &value); if (sRGB) { // Set EXIF Colorspace of sRGB value.vt = VT_UI2; value.uiVal = 1; - (void)metawriter->SetMetadataByName(L"System.Image.ColorSpace", &value); + std::ignore = metawriter->SetMetadataByName(L"System.Image.ColorSpace", &value); } } } @@ -1177,7 +1178,7 @@ HRESULT DirectX::SaveWICTextureToFile( if (FAILED(hr)) return hr; - uint64_t imageSize = uint64_t(mapped.RowPitch) * uint64_t(desc.Height); + const uint64_t imageSize = uint64_t(mapped.RowPitch) * uint64_t(desc.Height); if (imageSize > UINT32_MAX) { pContext->Unmap(pStaging.Get(), 0); diff --git a/DXUT/Core/WICTextureLoader.cpp b/DXUT/Core/WICTextureLoader.cpp index 9534686c..3ea864b2 100644 --- a/DXUT/Core/WICTextureLoader.cpp +++ b/DXUT/Core/WICTextureLoader.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #ifdef __clang__ #pragma clang diagnostic ignored "-Wcovered-switch-default" @@ -206,7 +207,7 @@ namespace #endif } - IWICImagingFactory* _GetWIC() noexcept + IWICImagingFactory* GetWIC() noexcept { static INIT_ONCE s_initOnce = INIT_ONCE_STATIC_INIT; @@ -224,7 +225,7 @@ namespace } //--------------------------------------------------------------------------------- - DXGI_FORMAT _WICToDXGI(const GUID& guid) noexcept + DXGI_FORMAT WICToDXGI(const GUID& guid) noexcept { for (size_t i = 0; i < std::size(g_WICFormats); ++i) { @@ -244,9 +245,9 @@ namespace } //--------------------------------------------------------------------------------- - size_t _WICBitsPerPixel(REFGUID targetGuid) noexcept + size_t WICBitsPerPixel(REFGUID targetGuid) noexcept { - auto pWIC = _GetWIC(); + auto pWIC = GetWIC(); if (!pWIC) return 0; @@ -308,7 +309,7 @@ namespace //--------------------------------------------------------------------------------- void FitPowerOf2(UINT origx, UINT origy, UINT& targetx, UINT& targety, size_t maxsize) { - float origAR = float(origx) / float(origy); + const float origAR = float(origx) / float(origy); if (origx > origy) { @@ -319,7 +320,7 @@ namespace float bestScore = FLT_MAX; for (size_t y = maxsize; y > 0; y >>= 1) { - float score = fabsf((float(x) / float(y)) - origAR); + const float score = fabsf((float(x) / float(y)) - origAR); if (score < bestScore) { bestScore = score; @@ -336,7 +337,7 @@ namespace float bestScore = FLT_MAX; for (size_t x = maxsize; x > 0; x >>= 1) { - float score = fabsf((float(x) / float(y)) - origAR); + const float score = fabsf((float(x) / float(y)) - origAR); if (score < bestScore) { bestScore = score; @@ -408,7 +409,7 @@ namespace } else if (width > maxsize || height > maxsize) { - float ar = static_cast(height) / static_cast(width); + const float ar = static_cast(height) / static_cast(width); if (width > height) { twidth = static_cast(maxsize); @@ -439,7 +440,7 @@ namespace size_t bpp = 0; - DXGI_FORMAT format = _WICToDXGI(pixelFormat); + DXGI_FORMAT format = WICToDXGI(pixelFormat); if (format == DXGI_FORMAT_UNKNOWN) { if (memcmp(&GUID_WICPixelFormat96bppRGBFixedPoint, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0) @@ -467,9 +468,9 @@ namespace { memcpy_s(&convertGUID, sizeof(WICPixelFormatGUID), &g_WICConvert[i].target, sizeof(GUID)); - format = _WICToDXGI(g_WICConvert[i].target); + format = WICToDXGI(g_WICConvert[i].target); assert(format != DXGI_FORMAT_UNKNOWN); - bpp = _WICBitsPerPixel(convertGUID); + bpp = WICBitsPerPixel(convertGUID); break; } } @@ -480,7 +481,7 @@ namespace } else { - bpp = _WICBitsPerPixel(pixelFormat); + bpp = WICBitsPerPixel(pixelFormat); } #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) @@ -552,7 +553,7 @@ namespace sRGB = (loadFlags & WIC_LOADER_SRGB_DEFAULT) != 0; } - (void)PropVariantClear(&value); + std::ignore = PropVariantClear(&value); if (sRGB) format = MakeSRGB(format); @@ -573,14 +574,14 @@ namespace } // Allocate temporary memory for image - uint64_t rowBytes = (uint64_t(twidth) * uint64_t(bpp) + 7u) / 8u; - uint64_t numBytes = rowBytes * uint64_t(theight); + const uint64_t rowBytes = (uint64_t(twidth) * uint64_t(bpp) + 7u) / 8u; + const uint64_t numBytes = rowBytes * uint64_t(theight); if (rowBytes > UINT32_MAX || numBytes > UINT32_MAX) return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW); - auto rowPitch = static_cast(rowBytes); - auto imageSize = static_cast(numBytes); + auto const rowPitch = static_cast(rowBytes); + auto const imageSize = static_cast(numBytes); std::unique_ptr temp(new (std::nothrow) uint8_t[imageSize]); if (!temp) @@ -599,7 +600,7 @@ namespace else if (twidth != width || theight != height) { // Resize - auto pWIC = _GetWIC(); + auto pWIC = GetWIC(); if (!pWIC) return E_NOINTERFACE; @@ -650,7 +651,7 @@ namespace else { // Format conversion but no resize - auto pWIC = _GetWIC(); + auto pWIC = GetWIC(); if (!pWIC) return E_NOINTERFACE; @@ -767,7 +768,7 @@ namespace if (texture || textureView) { CHAR strFileA[MAX_PATH]; - int result = WideCharToMultiByte(CP_UTF8, + const int result = WideCharToMultiByte(CP_UTF8, WC_NO_BEST_FIT_CHARS, fileName, -1, @@ -911,7 +912,7 @@ HRESULT DirectX::CreateWICTextureFromMemoryEx( if (wicDataSize > UINT32_MAX) return HRESULT_FROM_WIN32(ERROR_FILE_TOO_LARGE); - auto pWIC = _GetWIC(); + auto pWIC = GetWIC(); if (!pWIC) return E_NOINTERFACE; @@ -1045,7 +1046,7 @@ HRESULT DirectX::CreateWICTextureFromFileEx( return E_INVALIDARG; } - auto pWIC = _GetWIC(); + auto pWIC = GetWIC(); if (!pWIC) return E_NOINTERFACE; diff --git a/DXUT/Optional/DXUTOpt_2019_Win10.vcxproj b/DXUT/Optional/DXUTOpt_2019_Win10.vcxproj index d9c708b4..a71a9b53 100644 --- a/DXUT/Optional/DXUTOpt_2019_Win10.vcxproj +++ b/DXUT/Optional/DXUTOpt_2019_Win10.vcxproj @@ -135,7 +135,7 @@ Fast StreamingSIMDExtensions2 ..\Core\;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -167,7 +167,7 @@ MultiThreadedDebugDLL Fast ..\Core\;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -199,7 +199,7 @@ Fast StreamingSIMDExtensions2 ..\Core\;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -230,7 +230,7 @@ MaxSpeed Fast ..\Core\;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -262,7 +262,7 @@ Fast StreamingSIMDExtensions2 ..\Core\;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -293,7 +293,7 @@ MaxSpeed Fast ..\Core\;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use diff --git a/DXUT/Optional/DXUTOpt_DirectXTK_2019_Win10.vcxproj b/DXUT/Optional/DXUTOpt_DirectXTK_2019_Win10.vcxproj index f7b908cc..d763ed64 100644 --- a/DXUT/Optional/DXUTOpt_DirectXTK_2019_Win10.vcxproj +++ b/DXUT/Optional/DXUTOpt_DirectXTK_2019_Win10.vcxproj @@ -135,7 +135,7 @@ Fast StreamingSIMDExtensions2 ..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -167,7 +167,7 @@ MultiThreadedDebugDLL Fast ..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -199,7 +199,7 @@ Fast StreamingSIMDExtensions2 ..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -230,7 +230,7 @@ MaxSpeed Fast ..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -262,7 +262,7 @@ Fast StreamingSIMDExtensions2 ..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use @@ -293,7 +293,7 @@ MaxSpeed Fast ..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories) - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_4;USE_DIRECTXTK;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb Use diff --git a/DXUT/Optional/DXUTsettingsdlg.cpp b/DXUT/Optional/DXUTsettingsdlg.cpp index 0a2e38bf..3984b876 100644 --- a/DXUT/Optional/DXUTsettingsdlg.cpp +++ b/DXUT/Optional/DXUTsettingsdlg.cpp @@ -1460,7 +1460,7 @@ HRESULT CD3DSettingsDlg::UpdateD3D11Resolutions() for (size_t idm = 0; idm < pOutputInfo->displayModeList.size(); idm++) { - const auto& DisplayMode = pOutputInfo->displayModeList[idm]; + auto const& DisplayMode = pOutputInfo->displayModeList[idm]; float fAspect = (float) DisplayMode.Width / (float) DisplayMode.Height; if (DisplayMode.Format == g_DeviceSettings.d3d11.sd.BufferDesc.Format) diff --git a/DXUT/README.md b/DXUT/README.md index 65d67f1f..7614b98a 100644 --- a/DXUT/README.md +++ b/DXUT/README.md @@ -22,7 +22,7 @@ Documentation is available on the [GitHub wiki](https://github.com/Microsoft/DXU *This project is 'archived'. It is still available for use for legacy projects, but use of it for new projects is not recommended.* -All content and source code for this package are subject to the terms of the [MIT License](http://opensource.org/licenses/MIT). +All content and source code for this package are subject to the terms of the [MIT License](https://github.com/microsoft/DXUT/blob/main/LICENSE). ## Contributing diff --git a/Effects11/Effects11_2019_Win10.vcxproj b/Effects11/Effects11_2019_Win10.vcxproj index 0ff50da3..8e60cde8 100644 --- a/Effects11/Effects11_2019_Win10.vcxproj +++ b/Effects11/Effects11_2019_Win10.vcxproj @@ -129,7 +129,7 @@ pchfx.h WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 5205 ProgramDatabase false @@ -161,7 +161,7 @@ pchfx.h WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 5205 ProgramDatabase false @@ -193,7 +193,7 @@ pchfx.h WIN32;NDEBUG;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 5205 @@ -224,7 +224,7 @@ pchfx.h WIN32;NDEBUG;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 5205 @@ -256,7 +256,7 @@ pchfx.h WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 5205 @@ -287,7 +287,7 @@ pchfx.h WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 5205 diff --git a/Effects11/README.md b/Effects11/README.md index f2d4fb59..0fa9e5b0 100644 --- a/Effects11/README.md +++ b/Effects11/README.md @@ -22,7 +22,7 @@ Documentation is available on the [GitHub wiki](https://github.com/Microsoft/FX1 *This project is 'archived'. It is still available for use for legacy projects, but use of it for new projects is not recommended.* -All content and source code for this package are subject to the terms of the [MIT License](http://opensource.org/licenses/MIT). +All content and source code for this package are subject to the terms of the [MIT License](https://github.com/microsoft/FX11/blob/main/LICENSE). ## Contributing