Add support for QPlatformNativeInterface.

Initial bits to enable figuring out the EGL display and context.

Change-Id: I4b578e356dceb40b4456f0590d32c8df1f51fa53
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
This commit is contained in:
Hannu Lyytinen 2012-04-11 09:41:21 +03:00 committed by Qt by Nokia
parent 0cd818aa7a
commit 89f6997e80
5 changed files with 188 additions and 3 deletions

View File

@ -18,7 +18,8 @@ SOURCES = main.cpp \
qkmscursor.cpp \ qkmscursor.cpp \
qkmsdevice.cpp \ qkmsdevice.cpp \
qkmsbuffermanager.cpp \ qkmsbuffermanager.cpp \
qkmsbackingstore.cpp qkmsbackingstore.cpp \
qkmsnativeinterface.cpp
HEADERS = qkmsintegration.h \ HEADERS = qkmsintegration.h \
qkmsscreen.h \ qkmsscreen.h \
qkmscontext.h \ qkmscontext.h \
@ -26,7 +27,8 @@ HEADERS = qkmsintegration.h \
qkmscursor.h \ qkmscursor.h \
qkmsdevice.h \ qkmsdevice.h \
qkmsbuffermanager.h \ qkmsbuffermanager.h \
qkmsbackingstore.h qkmsbackingstore.h \
qkmsnativeinterface.h
target.path += $$[QT_INSTALL_PLUGINS]/platforms target.path += $$[QT_INSTALL_PLUGINS]/platforms
INSTALLS += target INSTALLS += target

View File

@ -45,6 +45,7 @@
#include "qkmswindow.h" #include "qkmswindow.h"
#include "qkmsbackingstore.h" #include "qkmsbackingstore.h"
#include "qkmscontext.h" #include "qkmscontext.h"
#include "qkmsnativeinterface.h"
#include <QtPlatformSupport/private/qgenericunixprintersupport_p.h> #include <QtPlatformSupport/private/qgenericunixprintersupport_p.h>
#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h> #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
@ -58,7 +59,8 @@ QT_BEGIN_NAMESPACE
QKmsIntegration::QKmsIntegration() QKmsIntegration::QKmsIntegration()
: QPlatformIntegration(), : QPlatformIntegration(),
m_fontDatabase(new QGenericUnixFontDatabase()), m_fontDatabase(new QGenericUnixFontDatabase()),
m_eventDispatcher(createUnixEventDispatcher()) m_eventDispatcher(createUnixEventDispatcher()),
m_nativeInterface(new QKmsNativeInterface)
{ {
QGuiApplicationPrivate::instance()->setEventDispatcher(m_eventDispatcher); QGuiApplicationPrivate::instance()->setEventDispatcher(m_eventDispatcher);
setenv("EGL_PLATFORM", "drm",1); setenv("EGL_PLATFORM", "drm",1);
@ -129,4 +131,9 @@ QAbstractEventDispatcher *QKmsIntegration::guiThreadEventDispatcher() const
return m_eventDispatcher; return m_eventDispatcher;
} }
QPlatformNativeInterface *QKmsIntegration::nativeInterface() const
{
return m_nativeInterface;
}
QT_END_NAMESPACE QT_END_NAMESPACE

View File

@ -43,6 +43,7 @@
#define QPLATFORMINTEGRATION_KMS_H #define QPLATFORMINTEGRATION_KMS_H
#include <QtGui/QPlatformIntegration> #include <QtGui/QPlatformIntegration>
#include <QtGui/QPlatformNativeInterface>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -66,6 +67,8 @@ public:
void addScreen(QKmsScreen *screen); void addScreen(QKmsScreen *screen);
QPlatformNativeInterface *nativeInterface() const;
private: private:
QStringList findDrmDevices(); QStringList findDrmDevices();
@ -73,6 +76,7 @@ private:
QList<QKmsDevice *> m_devices; QList<QKmsDevice *> m_devices;
QPlatformFontDatabase *m_fontDatabase; QPlatformFontDatabase *m_fontDatabase;
QAbstractEventDispatcher *m_eventDispatcher; QAbstractEventDispatcher *m_eventDispatcher;
QPlatformNativeInterface *m_nativeInterface;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

View File

@ -0,0 +1,105 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <private/qguiapplication_p.h>
#include "qkmsnativeinterface.h"
#include "qkmsdevice.h"
#include "qscreen.h"
class QKmsResourceMap : public QMap<QByteArray, QKmsNativeInterface::ResourceType>
{
public:
QKmsResourceMap()
:QMap<QByteArray, QKmsNativeInterface::ResourceType>()
{
insert("egldisplay", QKmsNativeInterface::EglDisplay);
insert("eglcontext", QKmsNativeInterface::EglContext);
}
};
Q_GLOBAL_STATIC(QKmsResourceMap, qKmsResourceMap)
void *QKmsNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window)
{
QByteArray lowerCaseResource = resourceString.toLower();
ResourceType resource = qKmsResourceMap()->value(lowerCaseResource);
void *result = 0;
switch (resource) {
case EglDisplay:
result = eglDisplayForWindow(window);
break;
case EglContext:
result = eglContextForWindow(window);
break;
default:
result = 0;
}
return result;
}
void *QKmsNativeInterface::eglDisplayForWindow(QWindow *window)
{
QKmsScreen *screen = qPlatformScreenForWindow(window);
if (!screen)
return 0;
QKmsDevice *device = screen->device();
if (!device)
return 0;
return device->eglDisplay();
}
void *QKmsNativeInterface::eglContextForWindow(QWindow *window)
{
QKmsScreen *screen = qPlatformScreenForWindow(window);
if (!screen)
return 0;
QKmsDevice *device = screen->device();
if (!device)
return 0;
return device->eglContext();
}
QKmsScreen *QKmsNativeInterface::qPlatformScreenForWindow(QWindow *window)
{
QScreen *screen = window ? window->screen() : QGuiApplication::primaryScreen();
return static_cast<QKmsScreen *>(screen->handle());
}

View File

@ -0,0 +1,67 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QKMSNATIVEINTERFACE_H
#define QKMSNATIVEINTERFACE_H
#include "qkmsscreen.h"
#include <QtGui/QPlatformNativeInterface>
class QKmsNativeInterface : public QPlatformNativeInterface
{
public:
enum ResourceType {
EglDisplay,
EglContext
};
void *nativeResourceForWindow(const QByteArray &resourceString, QWindow *window);
void *eglDisplayForWindow(QWindow *window);
void *eglContextForWindow(QWindow *window);
private:
static QKmsScreen *qPlatformScreenForWindow(QWindow *window);
};
#endif // QKMSNATIVEINTERFACE_H