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

Fix refresh crash with ktx textures

Browse source
This commit is contained in:
Ryan Huffman 2017-05-03 11:12:11 -07:00
parent 7999ed6f60
commit a886963e20
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -472,6 +472,10 @@ void NetworkTexture::startMipRangeRequest(uint16_t low, uint16_t high) {
void NetworkTexture::ktxHeaderRequestFinished() { void NetworkTexture::ktxHeaderRequestFinished() {
Q_ASSERT(_ktxResourceState == LOADING_INITIAL_DATA); Q_ASSERT(_ktxResourceState == LOADING_INITIAL_DATA);
if (!_ktxHeaderRequest) {
return;
}
_ktxHeaderRequestFinished = true; _ktxHeaderRequestFinished = true;
maybeHandleFinishedInitialLoad(); maybeHandleFinishedInitialLoad();
} }
@ -479,6 +483,10 @@ void NetworkTexture::ktxHeaderRequestFinished() {
void NetworkTexture::ktxMipRequestFinished() { void NetworkTexture::ktxMipRequestFinished() {
Q_ASSERT(_ktxResourceState == LOADING_INITIAL_DATA || _ktxResourceState == REQUESTING_MIP); Q_ASSERT(_ktxResourceState == LOADING_INITIAL_DATA || _ktxResourceState == REQUESTING_MIP);
if (!_ktxMipRequest) {
return;
}
if (_ktxResourceState == LOADING_INITIAL_DATA) { if (_ktxResourceState == LOADING_INITIAL_DATA) {
_ktxHighMipRequestFinished = true; _ktxHighMipRequestFinished = true;
maybeHandleFinishedInitialLoad(); maybeHandleFinishedInitialLoad();
@ -683,7 +691,7 @@ void NetworkTexture::loadContent(const QByteArray& content) {
} }
void NetworkTexture::refresh() { void NetworkTexture::refresh() {
if ((_ktxHeaderRequest || _ktxMipRequest) && !loaded && !_failedToLoad) { if ((_ktxHeaderRequest || _ktxMipRequest) && !_loaded && !_failedToLoad) {
return; return;
} }
if (_ktxHeaderRequest || _ktxMipRequest) { if (_ktxHeaderRequest || _ktxMipRequest) {