summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWieland Hagen <wieland.hagen@kdab.com>2016-02-03 19:48:28 +0100
committerWieland Hagen <wieland.hagen@kdab.com>2016-02-04 09:54:38 +0000
commit40a00a2bc70d8df44b2520be4e00df46abd8e8b2 (patch)
treeb3e19149c6c72c27fd9b08f30ef8ed6842f3bc32
parent910065ad7585cbef7f49356de0c1434c791a9263 (diff)
Make TextureImage DNA more robust to collisions.
Task-number: QTBUG-50076 Change-Id: Iab8cac610bd9e14885d3f583b17b2e7e3a642e2f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/render/texture/textureimage.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp
index 3504833ae..09eacd075 100644
--- a/src/render/texture/textureimage.cpp
+++ b/src/render/texture/textureimage.cpp
@@ -149,7 +149,10 @@ void TextureImage::setTextureDataHandle(HTextureData handle)
void TextureImage::updateDNA()
{
- m_dna = ::qHash(m_layer + m_mipmapLevel + static_cast<int>(m_face) + m_textureDataHandle);
+ m_dna = ::qHash(m_layer
+ + (m_mipmapLevel << 4)
+ + (static_cast<int>(m_face) << 8)
+ + (m_textureDataHandle.handle() << 12));
}
TextureImageFunctor::TextureImageFunctor(TextureManager *textureManager,