summaryrefslogtreecommitdiffstats
path: root/src/render/renderers/opengl
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2019-10-30 11:40:09 +0000
committerMike Krus <mike.krus@kdab.com>2019-10-30 12:55:48 +0000
commit94895f0270ccb3a2423857e82b78b23581b1c2d8 (patch)
tree20297cc9dee9f6c8948020654c26b5af8929a199 /src/render/renderers/opengl
parentfbda2a3ba97907f04210fe8a6dac0f3056c6384d (diff)
Fix status change on QTextureLoader
Now setting to Loading when the functor change is synced to the backend. Avoid creating a new functor when downloads have completed, just use the same one and mark the node as dirty. Avoid recreating the functor when the format change comes from the backend (which caused the image to be loaded again). Change-Id: Ifcbbf54db56b57a58b0b5d1ce5f1475b6587f697 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/renderers/opengl')
-rw-r--r--src/render/renderers/opengl/textures/gltexture.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/render/renderers/opengl/textures/gltexture.cpp b/src/render/renderers/opengl/textures/gltexture.cpp
index e0a379138..20e6007a0 100644
--- a/src/render/renderers/opengl/textures/gltexture.cpp
+++ b/src/render/renderers/opengl/textures/gltexture.cpp
@@ -232,7 +232,6 @@ void GLTexture::loadTextureDataFromImages()
GLTexture::TextureUpdateInfo GLTexture::createOrUpdateGLTexture()
{
TextureUpdateInfo textureInfo;
- m_properties.status = QAbstractTexture::Error;
m_wasTextureRecreated = false;
const bool hasSharedTextureId = m_sharedTextureId > 0;