From c343f710f4d59643ab6b6d200cff29edee482094 Mon Sep 17 00:00:00 2001 From: Hannu Lyytinen Date: Tue, 10 Apr 2012 16:12:21 +0300 Subject: Use the new plugin system in the KMS plugin. Sync up the KMS QPA plugin with the plugin system changes. Change-Id: Ifaa8be6f11aeb93acc63643c62ca15db4e9bc38f Reviewed-by: Andy Nichols --- src/plugins/platforms/kms/kms.pro | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'src/plugins/platforms/kms/kms.pro') diff --git a/src/plugins/platforms/kms/kms.pro b/src/plugins/platforms/kms/kms.pro index 73a3fa0418..5b91326a39 100644 --- a/src/plugins/platforms/kms/kms.pro +++ b/src/plugins/platforms/kms/kms.pro @@ -1,11 +1,12 @@ TARGET = qkms - load(qt_plugin) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms -QT = core-private gui-private platformsupport-private opengl-private +QT += core-private gui-private platformsupport-private opengl-private +DESTDIR = $$QT.gui.plugins/platforms + +DEFINES += MESA_EGL_NO_X11_HEADERS -CONFIG += link_pkgconfig qpa/genericunixfontdatabase +CONFIG += link_pkgconfig egl qpa/genericunixfontdatabase PKGCONFIG += libdrm egl gbm glesv2 @@ -30,13 +31,5 @@ HEADERS = qkmsintegration.h \ target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target - - - - - - - - - - +OTHER_FILES += \ + kms.json -- cgit v1.2.3 From 89f6997e805e4bc94bea4aff592b5ae93aea8e85 Mon Sep 17 00:00:00 2001 From: Hannu Lyytinen Date: Wed, 11 Apr 2012 09:41:21 +0300 Subject: Add support for QPlatformNativeInterface. Initial bits to enable figuring out the EGL display and context. Change-Id: I4b578e356dceb40b4456f0590d32c8df1f51fa53 Reviewed-by: Andy Nichols --- src/plugins/platforms/kms/kms.pro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/kms/kms.pro') diff --git a/src/plugins/platforms/kms/kms.pro b/src/plugins/platforms/kms/kms.pro index 5b91326a39..93d972abe8 100644 --- a/src/plugins/platforms/kms/kms.pro +++ b/src/plugins/platforms/kms/kms.pro @@ -18,7 +18,8 @@ SOURCES = main.cpp \ qkmscursor.cpp \ qkmsdevice.cpp \ qkmsbuffermanager.cpp \ - qkmsbackingstore.cpp + qkmsbackingstore.cpp \ + qkmsnativeinterface.cpp HEADERS = qkmsintegration.h \ qkmsscreen.h \ qkmscontext.h \ @@ -26,7 +27,8 @@ HEADERS = qkmsintegration.h \ qkmscursor.h \ qkmsdevice.h \ qkmsbuffermanager.h \ - qkmsbackingstore.h + qkmsbackingstore.h \ + qkmsnativeinterface.h target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target -- cgit v1.2.3 From 5ab6a3270d1121fb4d50c3f79f497a9c52d5afa8 Mon Sep 17 00:00:00 2001 From: Hannu Lyytinen Date: Thu, 12 Apr 2012 15:09:52 +0300 Subject: Implement basic bits for device autodetection via udev. The graphics cards and eventually the input devices need to be resolved via udev. This commit adds a listener class and an abstract base class for writing device specific handlers. Change-Id: I62784c98bc7ad4bc1431d61cd5f13c8b48edf330 Reviewed-by: Andy Nichols --- src/plugins/platforms/kms/kms.pro | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/kms/kms.pro') diff --git a/src/plugins/platforms/kms/kms.pro b/src/plugins/platforms/kms/kms.pro index 93d972abe8..7c0cc79160 100644 --- a/src/plugins/platforms/kms/kms.pro +++ b/src/plugins/platforms/kms/kms.pro @@ -8,7 +8,7 @@ DEFINES += MESA_EGL_NO_X11_HEADERS CONFIG += link_pkgconfig egl qpa/genericunixfontdatabase -PKGCONFIG += libdrm egl gbm glesv2 +PKGCONFIG += libdrm libudev egl gbm glesv2 SOURCES = main.cpp \ qkmsintegration.cpp \ @@ -19,7 +19,9 @@ SOURCES = main.cpp \ qkmsdevice.cpp \ qkmsbuffermanager.cpp \ qkmsbackingstore.cpp \ - qkmsnativeinterface.cpp + qkmsnativeinterface.cpp \ + qkmsudevlistener.cpp \ + qkmsudevhandler.cpp HEADERS = qkmsintegration.h \ qkmsscreen.h \ qkmscontext.h \ @@ -28,7 +30,9 @@ HEADERS = qkmsintegration.h \ qkmsdevice.h \ qkmsbuffermanager.h \ qkmsbackingstore.h \ - qkmsnativeinterface.h + qkmsnativeinterface.h \ + qkmsudevlistener.h \ + qkmsudevhandler.h target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target -- cgit v1.2.3 From 2a5ade68fd4b536c766de395d2657cd37c9bb98b Mon Sep 17 00:00:00 2001 From: Hannu Lyytinen Date: Thu, 12 Apr 2012 15:15:26 +0300 Subject: Use the new udev based framework for detecting graphics cards. Get rid of hard coded device node and support any number of graphics cards. Change-Id: I50f07fb1e6ea321a4ae751db8fb49ab439dce51e Reviewed-by: Andy Nichols --- src/plugins/platforms/kms/kms.pro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/kms/kms.pro') diff --git a/src/plugins/platforms/kms/kms.pro b/src/plugins/platforms/kms/kms.pro index 7c0cc79160..f97973b1a1 100644 --- a/src/plugins/platforms/kms/kms.pro +++ b/src/plugins/platforms/kms/kms.pro @@ -21,7 +21,8 @@ SOURCES = main.cpp \ qkmsbackingstore.cpp \ qkmsnativeinterface.cpp \ qkmsudevlistener.cpp \ - qkmsudevhandler.cpp + qkmsudevhandler.cpp \ + qkmsudevdrmhandler.cpp HEADERS = qkmsintegration.h \ qkmsscreen.h \ qkmscontext.h \ @@ -32,7 +33,8 @@ HEADERS = qkmsintegration.h \ qkmsbackingstore.h \ qkmsnativeinterface.h \ qkmsudevlistener.h \ - qkmsudevhandler.h + qkmsudevhandler.h \ + qkmsudevdrmhandler.h target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target -- cgit v1.2.3