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

Fix NetworkTexture build errors on osx/linux

Browse source
This commit is contained in:
Ryan Huffman 2017-04-20 23:31:10 -07:00 committed by Atlante45
parent b2ff0a711e
commit 790290f40c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -411,7 +411,7 @@ void NetworkTexture::startRequestForNextMipLevel() {
setLoadPriority(this, -_originalKtxDescriptor->header.numberOfMipmapLevels + _lowestKnownPopulatedMip);
init();
ResourceCache::attemptRequest(_self);
TextureCache::attemptRequest(_self);
}
}
@ -471,7 +471,7 @@ void NetworkTexture::ktxMipRequestFinished() {
}
else if (_ktxResourceState == REQUESTING_MIP) {
Q_ASSERT(_ktxMipLevelRangeInFlight.first != NULL_MIP_LEVEL);
ResourceCache::requestCompleted(_self);
TextureCache::requestCompleted(_self);
if (_ktxMipRequest->getResult() == ResourceRequest::Success) {
Q_ASSERT(_ktxMipLevelRangeInFlight.second - _ktxMipLevelRangeInFlight.first == 0);
@ -519,7 +519,7 @@ void NetworkTexture::maybeHandleFinishedInitialLoad() {
if (_ktxHeaderRequestFinished && _ktxHighMipRequestFinished) {
ResourceCache::requestCompleted(_self);
TextureCache::requestCompleted(_self);
if (_ktxHeaderRequest->getResult() != ResourceRequest::Success || _ktxMipRequest->getResult() != ResourceRequest::Success) {
if (handleFailedRequest(_ktxMipRequest->getResult())) {

2
libraries/model-networking/src/model-networking/TextureCache.h
View file

@ -46,7 +46,7 @@ class NetworkTexture : public Resource, public Texture, public gpu::Texture::Mip
public:
NetworkTexture(const QUrl& url, image::TextureUsage::Type type, const QByteArray& content, int maxNumPixels);
NetworkTexture::~NetworkTexture() override;
~NetworkTexture() override;
QString getType() const override { return "NetworkTexture"; }