Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:58:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9741 from jherico/smarter_textures

Browse source 
Prevent name collisions in KTX from causing crashes
This commit is contained in:
samcake 2017-02-23 13:05:00 -08:00 committed by GitHub
commit 19c6056b51
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/gpu/src/gpu/Texture_ktx.cpp
View file

@ -117,6 +117,9 @@ ktx::KTXUniquePointer Texture::serialize(const Texture& texture) {
} }
auto ktxBuffer = ktx::KTX::create(header, images); auto ktxBuffer = ktx::KTX::create(header, images);
auto expectedMipCount = texture.evalNumMips();
assert(expectedMipCount == ktxBuffer->_images.size());
assert(expectedMipCount == header.numberOfMipmapLevels);
assert(0 == memcmp(&header, ktxBuffer->getHeader(), sizeof(ktx::Header))); assert(0 == memcmp(&header, ktxBuffer->getHeader(), sizeof(ktx::Header)));
assert(ktxBuffer->_images.size() == images.size()); assert(ktxBuffer->_images.size() == images.size());

3
libraries/model/src/model/TextureMap.cpp
View file

@ -103,8 +103,7 @@ gpu::Texture* cacheTexture(const std::string& name, gpu::Texture* srcTexture, bo
} }
}); });
std::string cleanedName = name; std::string cleanedName = QUrl::toPercentEncoding(name.c_str()).toStdString();
cleanedName = cleanedName.substr(cleanedName.find_last_of((char) '//') + 1);
std::string cacheFilename(ktxCacheFolder.toStdString()); std::string cacheFilename(ktxCacheFolder.toStdString());
cacheFilename += "/"; cacheFilename += "/";
cacheFilename += cleanedName; cacheFilename += cleanedName;