From 28471925ac6dc5d5eb7e4ef903d95fe7df5af685 Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 2 Jul 2014 01:08:58 +0200 Subject: [PATCH] Fixed possible bug in computing sampler id Former-commit-id: 29c20403571218c05e3d4405482bb312adda5a35 --- src/Nazara/Renderer/TextureSampler.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Nazara/Renderer/TextureSampler.cpp b/src/Nazara/Renderer/TextureSampler.cpp index f0e1bbeae..e304a5d49 100644 --- a/src/Nazara/Renderer/TextureSampler.cpp +++ b/src/Nazara/Renderer/TextureSampler.cpp @@ -57,7 +57,7 @@ void NzTextureSampler::SetAnisotropyLevel(nzUInt8 anisotropyLevel) { if (anisotropyLevel > s_maxAnisotropyLevel) { - NazaraWarning("Anisotropy level is over maximum anisotropy level (" + NzString::Number(anisotropyLevel) + " > " + NzString::Number(s_maxAnisotropyLevel)); + NazaraWarning("Anisotropy level is over maximum anisotropy level (" + NzString::Number(anisotropyLevel) + " > " + NzString::Number(s_maxAnisotropyLevel) + ')'); anisotropyLevel = s_maxAnisotropyLevel; } @@ -299,10 +299,10 @@ unsigned int NzTextureSampler::GetOpenGLID() const void NzTextureSampler::UpdateSamplerId() const { - nzUInt32 key = (m_mipmaps << 0) | // 1 bit - (m_filterMode << 1) | // 2 bits - (m_wrapMode << 3) | // 2 bits - (m_anisotropicLevel << 5); // 8 bits + nzUInt32 key = (((m_mipmaps) ? 1 : 0) << 0) | // 1 bit + (m_filterMode << 1) | // 2 bits + (m_wrapMode << 3) | // 2 bits + (m_anisotropicLevel << 5); // 8 bits auto it = s_samplers.find(key); if (it == s_samplers.end())