diff options
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp | 5 | ||||
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp index 136f23f339..dcc485ce17 100644 --- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp +++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp @@ -38,6 +38,7 @@ #include <QtQml/private/qqmlglobal_p.h> #include <QtQuick/private/qsgdistancefieldutil_p.h> #include <qopenglfunctions.h> +#include <qopenglframebufferobject.h> #include <qmath.h> #if !defined(QT_OPENGL_ES_2) @@ -324,7 +325,7 @@ void QSGDefaultDistanceFieldGlyphCache::resizeTexture(TextureInfo *texInfo, int GL_COLOR_BUFFER_BIT, GL_NEAREST); // Reset the default framebuffer - m_coreFuncs->glBindFramebuffer(GL_FRAMEBUFFER, 0); + QOpenGLFramebufferObject::bindDefault(); return; } else if (useTextureResizeWorkaround()) { @@ -449,7 +450,7 @@ void QSGDefaultDistanceFieldGlyphCache::resizeTexture(TextureInfo *texInfo, int m_funcs->glDeleteTextures(1, &tmp_texture); m_funcs->glDeleteTextures(1, &oldTexture); - m_funcs->glBindFramebuffer(GL_FRAMEBUFFER, 0); + QOpenGLFramebufferObject::bindDefault(); // restore render states if (stencilTestEnabled) diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 608c5f93f5..a848774ae9 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -202,7 +202,12 @@ void QQuickWidgetPrivate::itemGeometryChanged(QQuickItem *resizeItem, const QRec void QQuickWidgetPrivate::render(bool needsSync) { - context->makeCurrent(offscreenSurface); + if (!context->makeCurrent(offscreenSurface)) { + qWarning("QQuickWidget: Cannot render due to failing makeCurrent()"); + return; + } + + QOpenGLContextPrivate::get(context)->defaultFboRedirect = fbo->handle(); if (needsSync) { renderControl->polishItems(); @@ -217,6 +222,8 @@ void QQuickWidgetPrivate::render(bool needsSync) } static_cast<QOpenGLExtensions *>(context->functions())->flushShared(); + + QOpenGLContextPrivate::get(context)->defaultFboRedirect = 0; } void QQuickWidgetPrivate::renderSceneGraph() |