8909f8780b
Summary: SharingPlatformContext::swapBuffers needs to make the context current. For this is calls makeCurrent. Later on this tries to bind a fbo, which checks calls into the current QOpenGLContext. As we called makeCurrent on our own platform context Qt doesn't know that the context is current and returns in the worst case a nullptr and crashes. This change calls makeCurrent on the QOpenGLContext so that Qt also knows that this context is current now. The QOpenGLContext calls makeCurrent on the platform context, so what our code tried to do is still being done. In addition the method context() in AbstractPlatformContext is renamed to eglContext to no longer shadow the method in QPlatformContext. Reviewers: #kwin, #plasma_on_wayland Subscribers: plasma-devel, kwin Tags: #plasma_on_wayland, #kwin Differential Revision: https://phabricator.kde.org/D2582
77 lines
2.1 KiB
C++
77 lines
2.1 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2015 Martin Gräßlin <mgraesslin@kde.org>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*********************************************************************/
|
|
#include "platformcontextwayland.h"
|
|
#include "integration.h"
|
|
#include "window.h"
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
namespace QPA
|
|
{
|
|
|
|
PlatformContextWayland::PlatformContextWayland(QOpenGLContext *context, Integration *integration)
|
|
: AbstractPlatformContext(context, integration, integration->eglDisplay())
|
|
{
|
|
create();
|
|
}
|
|
|
|
bool PlatformContextWayland::makeCurrent(QPlatformSurface *surface)
|
|
{
|
|
Window *window = static_cast<Window*>(surface);
|
|
EGLSurface s = window->eglSurface();
|
|
if (s == EGL_NO_SURFACE) {
|
|
window->createEglSurface(eglDisplay(), config());
|
|
s = window->eglSurface();
|
|
if (s == EGL_NO_SURFACE) {
|
|
return false;
|
|
}
|
|
}
|
|
return eglMakeCurrent(eglDisplay(), s, s, eglContext());
|
|
}
|
|
|
|
bool PlatformContextWayland::isSharing() const
|
|
{
|
|
return false;
|
|
}
|
|
|
|
void PlatformContextWayland::swapBuffers(QPlatformSurface *surface)
|
|
{
|
|
Window *window = static_cast<Window*>(surface);
|
|
EGLSurface s = window->eglSurface();
|
|
if (s == EGL_NO_SURFACE) {
|
|
return;
|
|
}
|
|
eglSwapBuffers(eglDisplay(), s);
|
|
}
|
|
|
|
void PlatformContextWayland::create()
|
|
{
|
|
if (config() == 0) {
|
|
return;
|
|
}
|
|
if (!bindApi()) {
|
|
return;
|
|
}
|
|
createContext();
|
|
}
|
|
|
|
}
|
|
}
|