Commit 413bd53a authored by David Edmundson's avatar David Edmundson

Merge branch 'Plasma/5.14'

parents 85bc931d 0b7778f9
......@@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <logging.h>
#include <QOpenGLFramebufferObject>
#include <private/qopenglcontext_p.h>
namespace KWin
{
......@@ -48,6 +49,10 @@ SharingPlatformContext::SharingPlatformContext(QOpenGLContext *context, const EG
bool SharingPlatformContext::makeCurrent(QPlatformSurface *surface)
{
Window *window = static_cast<Window*>(surface);
// QOpenGLContext::makeCurrent in Qt5.12 calls platfrom->setContext before setCurrentContext
// but binding the content FBO looks up the format from the current context, so we need // to make sure sure Qt knows what the correct one is already
QOpenGLContextPrivate::setCurrentContext(context());
if (eglMakeCurrent(eglDisplay(), m_surface, m_surface, eglContext())) {
window->bindContentFBO();
return true;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment