|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -3,6 +3,6 @@
<service name="tar_git">
<param name="url">https://github.com/mer-hybris/qt5-qpa-hwcomposer-plugin.git</param>
<param name="branch">master</param>
- <param name="revision">58e4447c389e74abe3bfd6823c8db33e6bfe8ec6</param>
+ <param name="revision">61d352dfad855974d58690472b46bf77623b22b0</param>
</service>
</services>
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin-5.1.0.1.tar.bz2/hwcomposer/hwcomposer_backend.cpp
^
|
| @@ -64,7 +64,9 @@
// Some implementations insist on having the framebuffer module opened before loading
// the hardware composer one. Therefor we rely on using the fbdev HYBRIS_EGLPLATFORM
// here and use eglGetDisplay to initialize it.
- eglGetDisplay(EGL_DEFAULT_DISPLAY);
+ if (qEnvironmentVariableIsEmpty("QT_QPA_NO_FRAMEBUFFER_FIRST")) {
+ eglGetDisplay(EGL_DEFAULT_DISPLAY);
+ }
// Open hardware composer
HWC_PLUGIN_ASSERT_ZERO(hw_get_module(HWC_HARDWARE_MODULE_ID, (const hw_module_t **)(&hwc_module)));
@@ -95,6 +97,15 @@
fprintf(stderr, " * Module: %p\n", hwc_device->module);
fprintf(stderr, "== hwcomposer device ==\n");
+ // Special-case for old hw adaptations that have the version encoded in
+ // legacy format, we have to check hwc_device->version directly, because
+ // the constants are actually encoded in the old format
+ if ((hwc_device->version == HWC_DEVICE_API_VERSION_0_1) ||
+ (hwc_device->version == HWC_DEVICE_API_VERSION_0_2) ||
+ (hwc_device->version == HWC_DEVICE_API_VERSION_0_3)) {
+ return new HwComposerBackend_v0(hwc_module, hwc_device);
+ }
+
// Determine which backend we use based on the supported module API version
switch (version) {
case HWC_DEVICE_API_VERSION_0_1:
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin-5.1.0.1.tar.bz2/hwcomposer/qeglfsintegration.cpp
^
|
| @@ -48,11 +48,13 @@
#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
+#include <QtPlatformSupport/private/qgenericunixthemes_p.h>
#include <QtPlatformSupport/private/qeglconvenience_p.h>
#include <QtPlatformSupport/private/qeglplatformcontext_p.h>
#include <QtPlatformSupport/private/qeglpbuffer_p.h>
#include <qpa/qplatformwindow.h>
+#include <qpa/qplatformservices.h>
#include <QtGui/QSurfaceFormat>
#include <QtGui/QOpenGLContext>
#include <QtGui/QScreen>
@@ -67,6 +69,15 @@
QT_BEGIN_NAMESPACE
+class GenericEglFSTheme: public QGenericUnixTheme
+{
+public:
+ static QStringList themeNames()
+ {
+ return QStringList() << QLatin1String("generic_eglfs");
+ }
+};
+
QEglFSIntegration::QEglFSIntegration()
: mHwc(NULL)
, mEventDispatcher(createUnixEventDispatcher())
@@ -238,4 +249,17 @@
return chooser.chooseConfig();
}
+QStringList QEglFSIntegration::themeNames() const
+{
+ return GenericEglFSTheme::themeNames();
+}
+
+QPlatformTheme *QEglFSIntegration::createPlatformTheme(const QString &name) const
+{
+ if (name == QLatin1String("generic_qeglfs"))
+ return new GenericEglFSTheme;
+
+ return GenericEglFSTheme::createUnixTheme(name);
+}
+
QT_END_NAMESPACE
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin-5.1.0.1.tar.bz2/hwcomposer/qeglfsintegration.h
^
|
| @@ -88,6 +88,10 @@
QPlatformInputContext *inputContext() const { return mInputContext; }
+ QStringList themeNames() const;
+
+ QPlatformTheme *createPlatformTheme(const QString &name) const;
+
private:
HwComposerContext *mHwc;
EGLDisplay mDisplay;
|
