From 731651af99d2c2440cc26f91115fc877fc729e3e Mon Sep 17 00:00:00 2001 From: Lionel CHAZALLON Date: Mon, 8 Jan 2018 19:47:41 +0100 Subject: eglfs: Forward nativeRes.ForScreen.() to backends Change-Id: I928f97483806ee74ca844941eed455ff4f9d9508 Reviewed-by: Laszlo Agocs --- src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp | 7 +++++++ src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h | 2 +- src/plugins/platforms/eglfs/api/qeglfsintegration.cpp | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/eglfs') diff --git a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp index 0fc4cc54e0..1b8f50a1c6 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp @@ -363,6 +363,13 @@ void *QEglFSDeviceIntegration::nativeResourceForIntegration(const QByteArray &na return nullptr; } +void *QEglFSDeviceIntegration::nativeResourceForScreen(const QByteArray &resource, QScreen *screen) +{ + Q_UNUSED(resource); + Q_UNUSED(screen); + return nullptr; +} + void *QEglFSDeviceIntegration::wlDisplay() const { return nullptr; diff --git a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h index d927bc9bc6..71ffb4c69a 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h @@ -105,7 +105,7 @@ public: virtual bool supportsSurfacelessContexts() const; virtual QFunctionPointer platformFunction(const QByteArray &function) const; virtual void *nativeResourceForIntegration(const QByteArray &name); - + virtual void *nativeResourceForScreen(const QByteArray &resource, QScreen *screen); virtual void *wlDisplay() const; static EGLConfig chooseConfig(EGLDisplay display, const QSurfaceFormat &format); diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp index c0ecfd235f..33878a5f50 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp @@ -331,7 +331,7 @@ void *QEglFSIntegration::nativeResourceForIntegration(const QByteArray &resource return result; } -void *QEglFSIntegration::nativeResourceForScreen(const QByteArray &resource, QScreen *) +void *QEglFSIntegration::nativeResourceForScreen(const QByteArray &resource, QScreen *screen) { void *result = 0; @@ -342,6 +342,7 @@ void *QEglFSIntegration::nativeResourceForScreen(const QByteArray &resource, QSc result = reinterpret_cast(nativeDisplay()); break; default: + result = qt_egl_device_integration()->nativeResourceForScreen(resource, screen); break; } -- cgit v1.2.3