alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Have separate texture hashes for each window

Browse Source 
Apparently in nvidia we get corruptions when a texture created for a window
is used in another one.
With this patch we tell the texture has changed when we move it from a
window to another, so it's re-created and we keep textures for all windows
separately. This way we ensure they don't mix.

REVIEW: 119465
This commit is contained in:
Aleix Pol 2014-07-28 19:01:33 +02:00 committed by Marco Martin
parent 712de91021
commit ebe9011253
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/declarativeimports/core/framesvgitem.cpp
View File

@ -37,17 +37,23 @@
namespace Plasma namespace Plasma
{ {
typedef QHash<qint64, QWeakPointer<QSGTexture> > TexturesCache; typedef QHash<qint64, QHash<QWindow*, QWeakPointer<QSGTexture> > > TexturesCache;
Q_GLOBAL_STATIC(TexturesCache, s_cache) Q_GLOBAL_STATIC(TexturesCache, s_cache)
QSharedPointer<QSGTexture> loadTexture(QQuickWindow *window, const QImage &image) QSharedPointer<QSGTexture> loadTexture(QQuickWindow *window, const QImage &image)
{ {
qint64 id = image.cacheKey(); qint64 id = image.cacheKey();
QSharedPointer<QSGTexture> texture = s_cache->value(id).toStrongRef(); QSharedPointer<QSGTexture> texture = s_cache->value(id).value(window).toStrongRef();
if (!texture) { if (!texture) {
auto cleanAndDelete = [id](QSGTexture* texture) { s_cache->remove(id); delete texture; }; auto cleanAndDelete = [window, id](QSGTexture* texture) {
QHash<QWindow*, QWeakPointer<QSGTexture> >& textures = (*s_cache)[id];
textures.remove(window);
if (textures.isEmpty())
s_cache->remove(id);
delete texture;
};
texture = QSharedPointer<QSGTexture>(window->createTextureFromImage(image), cleanAndDelete); texture = QSharedPointer<QSGTexture>(window->createTextureFromImage(image), cleanAndDelete);
s_cache->insert(id, texture.toWeakRef()); (*s_cache)[id][window] = texture.toWeakRef();
} }
return texture; return texture;
} }