diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-10 15:06:26 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2016-05-10 23:24:54 +0000 |
| commit | 834087c3242cbb3d85a5b8b155788a368f09b836 (patch) | |
| tree | 072cd363a4524eaddf1b3ce7ffdfe0d1741d7f69 /src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice | |
| parent | ace5e5fc7b9215041093f6986e3ef4efd1de7cc0 (diff) | |
eglfs: Fix DRM+KMS backends
The native display was simply invalid.
Task-number: QTBUG-53225
Change-Id: I682fb1d91dbea3dab971a079060d181fc313da46
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice')
3 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp index e09f2fdb18..743f714cf0 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp @@ -39,6 +39,7 @@ #include "qeglfskmsegldevice.h" #include "qeglfskmsegldevicescreen.h" +#include "qeglfskmsegldeviceintegration.h" #include <QtCore/private/qcore_unix_p.h> @@ -68,9 +69,9 @@ void QEglFSKmsEglDevice::close() setFd(-1); } -EGLNativeDisplayType QEglFSKmsEglDevice::device() const +EGLNativeDisplayType QEglFSKmsEglDevice::nativeDisplay() const { - return 0; + return static_cast<QEglFSKmsEglDeviceIntegration *>(m_integration)->eglDevice(); } QEglFSKmsScreen *QEglFSKmsEglDevice::createScreen(QEglFSKmsIntegration *integration, QEglFSKmsDevice *device, QEglFSKmsOutput output, QPoint position) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.h index f85ec27fa2..b1c98f3fe6 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.h @@ -50,7 +50,7 @@ public: virtual bool open() Q_DECL_OVERRIDE; virtual void close() Q_DECL_OVERRIDE; - virtual EGLNativeDisplayType device() const Q_DECL_OVERRIDE; + virtual EGLNativeDisplayType nativeDisplay() const Q_DECL_OVERRIDE; virtual QEglFSKmsScreen *createScreen(QEglFSKmsIntegration *integration, QEglFSKmsDevice *device, diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h index 43c1945a7f..f04c42267a 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h @@ -62,6 +62,9 @@ public: QEglFSWindow *createWindow(QWindow *window) const Q_DECL_OVERRIDE; virtual bool separateScreens() const Q_DECL_OVERRIDE; + + EGLDeviceEXT eglDevice() const { return m_egl_device; } + protected: QEglFSKmsDevice *createDevice(const QString &devicePath) Q_DECL_OVERRIDE; |