diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 15:59:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 15:59:29 +0100 |
| commit | 33b5e950910e4f1e935fce8ae572aafdffa3b6d0 (patch) | |
| tree | 70b177f0b06826996438971c0ead81a5d4ddba10 /src/render/texture/textureimage.cpp | |
| parent | 7acd6166c011b7c9f6443c520cb58b491566c4a7 (diff) | |
| parent | 149ce21d47df023f1638620efd940404ae36465e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Ia78be95187077c194b99063730259f9dd3ca0c86
Diffstat (limited to 'src/render/texture/textureimage.cpp')
| -rw-r--r-- | src/render/texture/textureimage.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp index d63990d25..c607025d0 100644 --- a/src/render/texture/textureimage.cpp +++ b/src/render/texture/textureimage.cpp @@ -152,7 +152,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, |