diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-04 21:32:01 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-08 09:55:53 +0200 |
| commit | 3f5e21a0cc9f41f1747e5c431695e7798ee489db (patch) | |
| tree | ccd9f02554d16f68fb66a8f2dd59368dd1a43c30 /src/quick/items/context2d | |
| parent | c8dd51333f14941d9a5c2d3798768df342aa48d4 (diff) | |
Remove OpenGL dependency from QSGTexture
The QSGTexture API is now clean, the OpenGL-specific functions are
removed.
Docs are to be updated in a separate patch.
QSGPlainTexture, and a number of texture related places have to follow
suit.
The OpenGL atlas texture implementation is now removed.
Task-number: QTBUG-84717
Task-number: QTBUG-84623
Change-Id: I1aab3b8b9145bb74ad39ef836ce540fc851292c5
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/items/context2d')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dtexture.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp index 1cf3891488..96af4008df 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture.cpp +++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp @@ -463,11 +463,13 @@ QSGTexture *QQuickContext2DFBOTexture::textureForNextFrame(QSGTexture *lastTextu if (m_dirtyTexture) { if (!m_gl) { // on a rendering thread, use the fbo directly... - texture->setTextureId(m_fbo->texture()); + // ### glpurge + //texture->setTextureId(m_fbo->texture()); } else { // on GUI or custom thread, use display textures... m_displayTexture = m_displayTexture == 0 ? 1 : 0; - texture->setTextureId(m_displayTextures[m_displayTexture]); + // ### glpurge + //texture->setTextureId(m_displayTextures[m_displayTexture]); } texture->setTextureSize(m_fbo->size()); m_dirtyTexture = false; |