diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-15 09:51:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-15 09:58:16 +0100 |
| commit | 9808b53fde1dfc65ad3757cc6720e430c3cc89a2 (patch) | |
| tree | a0517ae1e290e7bbdb118c9f01f4e6e5d744998c /src/gui/opengl/qopenglframebufferobject.cpp | |
| parent | c214379156e4c75dcfe59cf73d69b912f4293303 (diff) | |
| parent | 246fe271878dbe586b5f3222a78d67dfecd1ca83 (diff) | |
| download | qtbase-9808b53fde1dfc65ad3757cc6720e430c3cc89a2.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
configure
src/plugins/platforms/eglfs/qeglfsintegration.cpp
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b
Diffstat (limited to 'src/gui/opengl/qopenglframebufferobject.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglframebufferobject.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index d9d4288ec8..9b07129303 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -955,6 +955,12 @@ QOpenGLFramebufferObject::~QOpenGLFramebufferObject() d->stencil_buffer_guard->free(); if (d->fbo_guard) d->fbo_guard->free(); + + QOpenGLContextPrivate *contextPrv = QOpenGLContextPrivate::get(QOpenGLContext::currentContext()); + if (contextPrv && contextPrv->qgl_current_fbo == this) { + contextPrv->qgl_current_fbo_invalid = true; + contextPrv->qgl_current_fbo = Q_NULLPTR; + } } /*! |