From 8ec785d21c13ed0a8d375ff13bf06bea1deb11ae Mon Sep 17 00:00:00 2001 From: Wieland Hagen Date: Wed, 21 Dec 2016 23:07:44 +0700 Subject: Rename Texture::DirtyGenerators to DirtyImageGenerators To distinguish clearly from DirtyDataGenerator Change-Id: Ib170529c027f24bf848a25f99dd34352a1d1030e Reviewed-by: Sean Harmer --- src/render/backend/renderer.cpp | 2 +- src/render/texture/texture.cpp | 8 ++++---- src/render/texture/texture_p.h | 2 +- src/render/texture/textureimage.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 19529887a..c0b85c349 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -991,7 +991,7 @@ void Renderer::updateTexture(Texture *texture) !glTextureManager->setParameters(glTexture, texture->parameters())) qWarning() << "[Qt3DRender::TextureNode] updateTexture: TextureImpl.setParameters failed, should be non-shared"; - if (dirtyFlags.testFlag(Texture::DirtyGenerators) && + if (dirtyFlags.testFlag(Texture::DirtyImageGenerators) && !glTextureManager->setImages(glTexture, texture->textureImages())) qWarning() << "[Qt3DRender::TextureNode] updateTexture: TextureImpl.setGenerators failed, should be non-shared"; diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp index b793462ca..8dd9ad229 100644 --- a/src/render/texture/texture.cpp +++ b/src/render/texture/texture.cpp @@ -61,7 +61,7 @@ namespace Render { Texture::Texture() // We need backend -> frontend notifications to update the status of the texture : BackendNode(ReadWrite) - , m_dirty(DirtyGenerators|DirtyProperties|DirtyParameters|DirtyDataGenerator) + , m_dirty(DirtyImageGenerators|DirtyProperties|DirtyParameters|DirtyDataGenerator) , m_textureImageManager(nullptr) { } @@ -101,7 +101,7 @@ void Texture::addTextureImage(Qt3DCore::QNodeId id) qWarning() << "[Qt3DRender::TextureNode] addTextureImage: image handle is NULL"; } else if (!m_textureImages.contains(handle)) { m_textureImages << handle; - addDirtyFlag(DirtyGenerators); + addDirtyFlag(DirtyImageGenerators); } } @@ -117,7 +117,7 @@ void Texture::removeTextureImage(Qt3DCore::QNodeId id) qWarning() << "[Qt3DRender::TextureNode] removeTextureImage: image handle is NULL"; } else { m_textureImages.removeAll(handle); - addDirtyFlag(DirtyGenerators); + addDirtyFlag(DirtyImageGenerators); } } @@ -269,7 +269,7 @@ void Texture::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &chan m_parameters.comparisonMode = data.comparisonMode; m_dataFunctor = data.dataFunctor; - addDirtyFlag(DirtyFlags(DirtyGenerators|DirtyProperties|DirtyParameters)); + addDirtyFlag(DirtyFlags(DirtyImageGenerators|DirtyProperties|DirtyParameters)); } diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h index 1ce73b0fe..f99d1d38b 100644 --- a/src/render/texture/texture_p.h +++ b/src/render/texture/texture_p.h @@ -135,7 +135,7 @@ public: NotDirty = 0, DirtyProperties = 0x1, DirtyParameters = 0x2, - DirtyGenerators = 0x4, + DirtyImageGenerators = 0x4, DirtyDataGenerator = 0x8 }; Q_DECLARE_FLAGS(DirtyFlags, DirtyFlag) diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp index f44a82649..b732be2d9 100644 --- a/src/render/texture/textureimage.cpp +++ b/src/render/texture/textureimage.cpp @@ -106,7 +106,7 @@ void TextureImage::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) // Notify the Texture that we were updated and request it to schedule an update job Texture *txt = m_textureManager->data(m_textureProvider); if (txt != nullptr) - txt->addDirtyFlag(Texture::DirtyGenerators); + txt->addDirtyFlag(Texture::DirtyImageGenerators); } markDirty(AbstractRenderer::AllDirty); -- cgit v1.2.3