summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvenn-Arne Dragly <s@dragly.com>2018-10-29 12:19:09 +0100
committerAndy Nichols <andy.nichols@qt.io>2018-11-09 09:00:56 +0000
commit1cfb150483ebee4720e9d2c249927071664a912c (patch)
treead334f49e02b461f31bd80e95590e9cee27b3aa7
parent8619fa84c095057989b14192a582b50911267227 (diff)
Do not load textures or images if nothing changed
Change-Id: If59a7f9bff1bb1eb978e18c38d196125851e268d Reviewed-by: Andy Nichols <andy.nichols@qt.io>
-rw-r--r--src/runtime/dragon/jobs/dragontexturejobs.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/runtime/dragon/jobs/dragontexturejobs.cpp b/src/runtime/dragon/jobs/dragontexturejobs.cpp
index d5ea4e3..8df5630 100644
--- a/src/runtime/dragon/jobs/dragontexturejobs.cpp
+++ b/src/runtime/dragon/jobs/dragontexturejobs.cpp
@@ -52,10 +52,8 @@ LoadedTextureImages loadTextureImages(LoadedTextureImages loadedTextureImages,
{
loadedTextureImages.nodes.reset();
- // If nothing changes, we'll just return the current data
-// if (!textureImages.anythingDirty() && loadedTextureImages.loadingImages.size() == 0
-// && loadedTextureImages.loadedImages.size() == 0)
-// return loadedTextureImages;
+ if (!textureImages.anythingDirty())
+ return loadedTextureImages;
// TODO unfortunate that we ended up capturing loadedTextureImages here just to be able to
// modify `created`
@@ -150,8 +148,9 @@ LoadedTextures loadTextures(LoadedTextures loadedTextures, const ValueContainer<
const LoadedTextureImages &loadedImages)
{
loadedTextures.reset();
-// if (!textures.anythingDirty() && !loadedImages.nodes.anythingDirty())
-// return loadedTextures;
+
+ if (!textures.anythingDirty() && !loadedImages.nodes.anythingDirty())
+ return loadedTextures;
auto generateTexture = [&loadedImages](const QNodeId &id, const Immutable<Texture> &texture) {
LoadedTexture loadedTexture;