From efd936c21e4d6995c419ecc9a994483592d92f50 Mon Sep 17 00:00:00 2001 From: assiduous Date: Fri, 8 May 2020 18:34:58 -0700 Subject: Fixed MSVC compiler warnings + treat warnings as errors; made Diligent-BuildSettings private dependency for all projects --- Graphics/GraphicsEngineVulkan/src/SamplerVkImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Graphics/GraphicsEngineVulkan') diff --git a/Graphics/GraphicsEngineVulkan/src/SamplerVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/SamplerVkImpl.cpp index 38943da6..1cdad70b 100644 --- a/Graphics/GraphicsEngineVulkan/src/SamplerVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/SamplerVkImpl.cpp @@ -60,7 +60,7 @@ SamplerVkImpl::SamplerVkImpl(IReferenceCounters* pRefCounters, RenderDeviceVkImp SamplerCI.mipLodBias = m_Desc.MipLODBias; SamplerCI.anisotropyEnable = IsAnisotropicFilter(m_Desc.MinFilter); #ifdef DILIGENT_DEVELOPMENT - if (SamplerCI.anisotropyEnable != IsAnisotropicFilter(m_Desc.MagFilter)) + if ((SamplerCI.anisotropyEnable != VK_FALSE) != IsAnisotropicFilter(m_Desc.MagFilter)) { LOG_ERROR("Min and mag filters must both be either anisotropic filters or non-anisotropic ones"); } @@ -69,7 +69,7 @@ SamplerVkImpl::SamplerVkImpl(IReferenceCounters* pRefCounters, RenderDeviceVkImp SamplerCI.maxAnisotropy = static_cast(m_Desc.MaxAnisotropy); SamplerCI.compareEnable = IsComparisonFilter(m_Desc.MinFilter); #ifdef DILIGENT_DEVELOPMENT - if (SamplerCI.compareEnable != IsComparisonFilter(m_Desc.MagFilter)) + if ((SamplerCI.compareEnable != VK_FALSE) != IsComparisonFilter(m_Desc.MagFilter)) { LOG_ERROR("Min and mag filters must both be either comparison filters or non-comparison ones"); } -- cgit v1.2.3