diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-08-17 12:16:44 +0300 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2012-08-17 12:37:56 +0200 |
| commit | 882b5abd60dd254e45fc714f189fc06612ee0184 (patch) | |
| tree | c2f915366ef63a7c653676efa9d65b4ccaead04d /src | |
| parent | bd28cd9a9e0f9733bd5bf358466e5e0ed0a05495 (diff) | |
Do not pass texture ownership to scenegraph in WaylandSurfaceItem
Doing so breaks many simple cases of GL rendering where there is one
attach followed by multiple damages. Letting SG destroy the GL texture
when deleting the old QSGTexture instance is wrong and results in
showing nothing but the very first frame on the screen.
Also, SurfaceBuffer does delete the GL texture upon destruction so the
ownership should stay with it.
This reverts c1ee015bab06e82bccbb723b522c185a8188cab5, not sure why
the change was introduced in the first place.
Change-Id: Ie91574daadeeb7214a55f8e32c10d0a316c0e2c8
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compositor/compositor_api/waylandsurfaceitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/waylandsurfaceitem.cpp b/src/compositor/compositor_api/waylandsurfaceitem.cpp index 08fedc51f..6a6d8c613 100644 --- a/src/compositor/compositor_api/waylandsurfaceitem.cpp +++ b/src/compositor/compositor_api/waylandsurfaceitem.cpp @@ -349,7 +349,7 @@ void WaylandSurfaceItem::updateTexture() QSGTexture *oldTexture = texture; if (m_surface->type() == WaylandSurface::Texture) { QOpenGLContext *context = QOpenGLContext::currentContext(); - QQuickCanvas::CreateTextureOptions opt = QQuickCanvas::TextureOwnsGLTexture; + QQuickCanvas::CreateTextureOptions opt = 0; if (useTextureAlpha()) { opt |= QQuickCanvas::TextureHasAlphaChannel; } |