Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 09:44:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix rebase

Browse source
This commit is contained in:
Brad Davis 2017-03-08 12:11:25 -08:00
parent e46302e5da
commit 9d56001341
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/model-networking/src/model-networking/TextureCache.cpp
View file

@ -497,7 +497,7 @@ void FileReader::read() {
gpu::Texture::Usage usage;
gpu::TextureUsageType usageType(gpu::TextureUsageType::RESOURCE);
gpu::Sampler sampler(gpu::Sampler::FILTER_MIN_MAG_MIP_LINEAR);
texture.reset(gpu::Texture::unserialize(usage, usageType, ktx, sampler));
texture.reset(gpu::Texture::unserialize(ktx, usageType, usage, sampler.getDesc()));
texture->setKtxBacking(ktx);
}
@ -556,7 +556,8 @@ void ImageReader::read() {
auto url = _url.toString().toStdString();
PROFILE_RANGE_EX(resource_parse_image, __FUNCTION__, 0xffff0000, 0);
texture.reset(resource.staticCast<NetworkTexture>()->getTextureLoader()(image, url));
auto networkTexture = resource.staticCast<NetworkTexture>();
texture.reset(networkTexture->getTextureLoader()(image, url));
texture->setSource(url);
if (texture) {
texture->setFallbackTexture(networkTexture->getFallbackTexture());