From fa78127622424fba161f5f42e9e76c72e653828a Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Thu, 29 Jan 2015 19:09:39 +0100 Subject: Introduce QSG_TRANSIENT_IMAGES. This feature enables the same feature that we already have in the 'nonpreservedtexture' in the scene graph playground. This change also cleans up some leftover logic from the early Qt 5.2 days when we had to manually extract the image from the default texture factory rather than going through QQuickWindow::createTexture(). This cleanup is required for the logic to work. Change-Id: I7cdf15d981ba8af94f8d51781fc01e2b834b77c6 Reviewed-by: Robin Burchell --- src/quick/scenegraph/qsgcontext.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/quick/scenegraph/qsgcontext.cpp') diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index 95388d82e0..096f53b94c 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -806,10 +806,7 @@ QSGTexture *QSGRenderContext::textureForFactory(QQuickTextureFactory *factory, Q m_mutex.unlock(); if (!texture) { - if (QQuickDefaultTextureFactory *dtf = qobject_cast(factory)) - texture = createTexture(dtf->image()); - else - texture = factory->createTexture(window); + texture = factory->createTexture(window); m_mutex.lock(); m_textures.insert(factory, texture); -- cgit v1.2.3