eglfs_kms: Move out window subclass from integration
Clean up the includes too while we are at it. Task-number: QTBUG-63058 Change-Id: I36eaaa5fc18219ca271b6bea8425ac8cc7cb8b6d Reviewed-by: Andy Nichols <andy.nichols@qt.io>bb10
Laszlo Agocs
parent
9273044567
commit
d47475bf65
|
|
@ -19,11 +19,13 @@ SOURCES += $$PWD/qeglfskmsgbmmain.cpp \
|
|||
$$PWD/qeglfskmsgbmintegration.cpp \
|
||||
$$PWD/qeglfskmsgbmdevice.cpp \
|
||||
$$PWD/qeglfskmsgbmscreen.cpp \
|
||||
$$PWD/qeglfskmsgbmcursor.cpp
|
||||
$$PWD/qeglfskmsgbmcursor.cpp \
|
||||
$$PWD/qeglfskmsgbmwindow.cpp
|
||||
|
||||
HEADERS += $$PWD/qeglfskmsgbmintegration.h \
|
||||
$$PWD/qeglfskmsgbmdevice.h \
|
||||
$$PWD/qeglfskmsgbmscreen.h \
|
||||
$$PWD/qeglfskmsgbmcursor.h
|
||||
$$PWD/qeglfskmsgbmcursor.h \
|
||||
$$PWD/qeglfskmsgbmwindow.h
|
||||
|
||||
OTHER_FILES += $$PWD/eglfs_kms.json
|
||||
|
|
|
|||
|
|
@ -43,21 +43,13 @@
|
|||
#include "qeglfskmsgbmdevice.h"
|
||||
#include "qeglfskmsgbmscreen.h"
|
||||
#include "qeglfskmsgbmcursor.h"
|
||||
#include "private/qeglfswindow_p.h"
|
||||
#include "qeglfskmsgbmwindow.h"
|
||||
#include "private/qeglfscursor_p.h"
|
||||
|
||||
#include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h>
|
||||
#include <QtEglSupport/private/qeglconvenience_p.h>
|
||||
#include <QtCore/QLoggingCategory>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtGui/qpa/qplatformwindow.h>
|
||||
#include <QtGui/qpa/qplatformcursor.h>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h>
|
||||
|
||||
#include <xf86drm.h>
|
||||
#include <xf86drmMode.h>
|
||||
#include <gbm.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
|
@ -159,50 +151,6 @@ QKmsDevice *QEglFSKmsGbmIntegration::createDevice()
|
|||
return new QEglFSKmsGbmDevice(screenConfig(), path);
|
||||
}
|
||||
|
||||
class QEglFSKmsGbmWindow : public QEglFSWindow
|
||||
{
|
||||
public:
|
||||
QEglFSKmsGbmWindow(QWindow *w, const QEglFSKmsGbmIntegration *integration)
|
||||
: QEglFSWindow(w)
|
||||
, m_integration(integration)
|
||||
{}
|
||||
void resetSurface() override;
|
||||
void invalidateSurface() override;
|
||||
const QEglFSKmsGbmIntegration *m_integration;
|
||||
};
|
||||
|
||||
void QEglFSKmsGbmWindow::resetSurface()
|
||||
{
|
||||
QEglFSKmsGbmScreen *gbmScreen = static_cast<QEglFSKmsGbmScreen *>(screen());
|
||||
EGLDisplay display = gbmScreen->display();
|
||||
QSurfaceFormat platformFormat = m_integration->surfaceFormatFor(window()->requestedFormat());
|
||||
m_config = QEglFSDeviceIntegration::chooseConfig(display, platformFormat);
|
||||
m_format = q_glFormatFromConfig(display, m_config, platformFormat);
|
||||
// One fullscreen window per screen -> the native window is simply the gbm_surface the screen created.
|
||||
m_window = reinterpret_cast<EGLNativeWindowType>(gbmScreen->createSurface());
|
||||
|
||||
PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC createPlatformWindowSurface = nullptr;
|
||||
const char *extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
|
||||
if (extensions && (strstr(extensions, "EGL_KHR_platform_gbm") || strstr(extensions, "EGL_MESA_platform_gbm"))) {
|
||||
createPlatformWindowSurface = reinterpret_cast<PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC>(
|
||||
eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT"));
|
||||
}
|
||||
|
||||
if (createPlatformWindowSurface) {
|
||||
m_surface = createPlatformWindowSurface(display, m_config, reinterpret_cast<void *>(m_window), nullptr);
|
||||
} else {
|
||||
qCDebug(qLcEglfsKmsDebug, "No eglCreatePlatformWindowSurface for GBM, falling back to eglCreateWindowSurface");
|
||||
m_surface = eglCreateWindowSurface(display, m_config, m_window, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
void QEglFSKmsGbmWindow::invalidateSurface()
|
||||
{
|
||||
QEglFSKmsGbmScreen *gbmScreen = static_cast<QEglFSKmsGbmScreen *>(screen());
|
||||
QEglFSWindow::invalidateSurface();
|
||||
gbmScreen->resetSurface();
|
||||
}
|
||||
|
||||
QEglFSWindow *QEglFSKmsGbmIntegration::createWindow(QWindow *window) const
|
||||
{
|
||||
return new QEglFSKmsGbmWindow(window, this);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,80 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2017 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the plugins of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 3 requirements
|
||||
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 2.0 or (at your option) the GNU General
|
||||
** Public license version 3 or any later version approved by the KDE Free
|
||||
** Qt Foundation. The licenses are as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
** https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "qeglfskmsgbmwindow.h"
|
||||
#include "qeglfskmsgbmintegration.h"
|
||||
#include "qeglfskmsgbmscreen.h"
|
||||
|
||||
#include <QtEglSupport/private/qeglconvenience_p.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
void QEglFSKmsGbmWindow::resetSurface()
|
||||
{
|
||||
QEglFSKmsGbmScreen *gbmScreen = static_cast<QEglFSKmsGbmScreen *>(screen());
|
||||
EGLDisplay display = gbmScreen->display();
|
||||
QSurfaceFormat platformFormat = m_integration->surfaceFormatFor(window()->requestedFormat());
|
||||
m_config = QEglFSDeviceIntegration::chooseConfig(display, platformFormat);
|
||||
m_format = q_glFormatFromConfig(display, m_config, platformFormat);
|
||||
// One fullscreen window per screen -> the native window is simply the gbm_surface the screen created.
|
||||
m_window = reinterpret_cast<EGLNativeWindowType>(gbmScreen->createSurface());
|
||||
|
||||
PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC createPlatformWindowSurface = nullptr;
|
||||
const char *extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
|
||||
if (extensions && (strstr(extensions, "EGL_KHR_platform_gbm") || strstr(extensions, "EGL_MESA_platform_gbm"))) {
|
||||
createPlatformWindowSurface = reinterpret_cast<PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC>(
|
||||
eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT"));
|
||||
}
|
||||
|
||||
if (createPlatformWindowSurface) {
|
||||
m_surface = createPlatformWindowSurface(display, m_config, reinterpret_cast<void *>(m_window), nullptr);
|
||||
} else {
|
||||
qCDebug(qLcEglfsKmsDebug, "No eglCreatePlatformWindowSurface for GBM, falling back to eglCreateWindowSurface");
|
||||
m_surface = eglCreateWindowSurface(display, m_config, m_window, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
void QEglFSKmsGbmWindow::invalidateSurface()
|
||||
{
|
||||
QEglFSKmsGbmScreen *gbmScreen = static_cast<QEglFSKmsGbmScreen *>(screen());
|
||||
QEglFSWindow::invalidateSurface();
|
||||
gbmScreen->resetSurface();
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2015 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Copyright (C) 2016 Pelagicore AG
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the plugins of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 3 requirements
|
||||
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 2.0 or (at your option) the GNU General
|
||||
** Public license version 3 or any later version approved by the KDE Free
|
||||
** Qt Foundation. The licenses are as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
** https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QEGLFSKMSGBMWINDOW_H
|
||||
#define QEGLFSKMSGBMWINDOW_H
|
||||
|
||||
#include "private/qeglfswindow_p.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QEglFSKmsGbmIntegration;
|
||||
|
||||
class QEglFSKmsGbmWindow : public QEglFSWindow
|
||||
{
|
||||
public:
|
||||
QEglFSKmsGbmWindow(QWindow *w, const QEglFSKmsGbmIntegration *integration)
|
||||
: QEglFSWindow(w),
|
||||
m_integration(integration)
|
||||
{ }
|
||||
void resetSurface() override;
|
||||
void invalidateSurface() override;
|
||||
|
||||
private:
|
||||
const QEglFSKmsGbmIntegration *m_integration;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QEGLFSKMSGBMWINDOW_H
|
||||
Loading…
Reference in New Issue