diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-05-09 01:34:58 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-05-09 01:34:58 +0000 |
| commit | efd936c21e4d6995c419ecc9a994483592d92f50 (patch) | |
| tree | 3eea8aae7933d73e20a2264fbfbe4914cbb64bb5 /Graphics/GraphicsEngineVulkan | |
| parent | Merge pull request #137 from markusgod/master (diff) | |
| download | DiligentCore-efd936c21e4d6995c419ecc9a994483592d92f50.tar.gz DiligentCore-efd936c21e4d6995c419ecc9a994483592d92f50.zip | |
Fixed MSVC compiler warnings + treat warnings as errors; made Diligent-BuildSettings private dependency for all projects
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/SamplerVkImpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<float>(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"); } |