whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add EGLFS integration plugin for Salvator-X on INTEGRITY Multivisor 

This plugin uses the Renesas RISP Window Manager.

Change-Id: If813c46ab8d39e966c0a969610841867885dd473
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
bb10
Timo Aarnipuro 2017-11-21 13:09:09 +02:00
parent 034e92b0f4
commit dffa01a438
7 changed files with 327 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/configure.json
View File

@ -716,6 +716,22 @@
},
"use": "egl"
},
"egl-rcar": {
"label": "RCAR EGL",
"type": "compile",
"test": {
"include": [ "EGL/egl.h" ],
"tail": [
"extern \"C\" {",
"extern unsigned long PVRGrfxServerInit(void);",
"}"
],
"main": [
"PVRGrfxServerInit();"
]
},
"use": "egl opengl_es2"
},
"evdev": {
"label": "evdev",
"type": "compile",
@ -1094,6 +1110,11 @@
"condition": "features.eglfs && tests.egl-viv",
"output": [ "privateFeature" ]
},
"eglfs_rcar": {
"label": "EGLFS RCAR",
"condition": "config.integrity && features.eglfs && tests.egl-rcar",
"output": [ "privateFeature" ]
},
"eglfs_viv_wl": {
"label": "EGLFS i.Mx6 Wayland",
"condition": "features.eglfs_viv && libs.wayland_server",
@ -1576,7 +1597,7 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla
"section": "EGLFS details",
"condition": "features.eglfs",
"entries": [
"eglfs_openwfd", "eglfs_viv", "eglfs_viv_wl", "eglfs_egldevice", "eglfs_gbm", "eglfs_mali", "eglfs_brcm", "egl_x11"
"eglfs_openwfd", "eglfs_viv", "eglfs_viv_wl", "eglfs_rcar", "eglfs_egldevice", "eglfs_gbm", "eglfs_mali", "eglfs_brcm", "egl_x11"
]
},
"linuxfb", "vnc", "mirclient",

1
src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro
View File

@ -7,6 +7,7 @@ qtConfig(eglfs_egldevice): SUBDIRS *= eglfs_kms_support eglfs_kms_egldevice
qtConfig(eglfs_brcm): SUBDIRS += eglfs_brcm
qtConfig(eglfs_mali): SUBDIRS += eglfs_mali
qtConfig(eglfs_viv): SUBDIRS += eglfs_viv
qtConfig(eglfs_rcar): SUBDIRS += eglfs_rcar
qtConfig(eglfs_viv_wl): SUBDIRS += eglfs_viv_wl
qtConfig(eglfs_openwfd): SUBDIRS += eglfs_openwfd
qtConfig(opengl): SUBDIRS += eglfs_emu

3
src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/eglfs_rcar.json Normal file
View File

@ -0,0 +1,3 @@
{
"Keys": [ "eglfs_rcar" ]
}

19
src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/eglfs_rcar.pro Normal file
View File

@ -0,0 +1,19 @@
TARGET = qeglfs-rcar-integration
QT += core-private gui-private eglfsdeviceintegration-private
INCLUDEPATH += $$PWD/../../api
CONFIG += egl
DEFINES += LINUX=1 EGL_API_FB=1
QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
SOURCES += $$PWD/qeglfsrcarmain.cpp \
$$PWD/qeglfsrcarintegration.cpp
HEADERS += $$PWD/qeglfsrcarintegration.h
OTHER_FILES += $$PWD/eglfs_rcar.json
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSRcarIntegrationPlugin
load(qt_plugin)

159
src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarintegration.cpp Normal file
View File

@ -0,0 +1,159 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QDebug>
#include <QtEglSupport/private/qeglconvenience_p.h>
#include <EGL/egl.h>
#include "INTEGRITY.h"
#include "qeglfsrcarintegration.h"
#define RCAR_DEFAULT_DISPLAY 1
#define RCAR_DEFAULT_WM_LAYER 2
extern "C" unsigned long PVRGrfxServerInit(void);
QT_BEGIN_NAMESPACE
void QEglFSRcarIntegration::platformInit()
{
QEglFSDeviceIntegration::platformInit();
PVRGrfxServerInit();
mScreenSize = q_screenSizeFromFb(0);
mNativeDisplay = (NativeDisplayType)EGL_DEFAULT_DISPLAY;
}
QSize QEglFSRcarIntegration::screenSize() const
{
return mScreenSize;
}
EGLNativeDisplayType QEglFSRcarIntegration::platformDisplay() const
{
return mNativeDisplay;
}
static r_wm_WinColorFmt_t getWMColorFormat(const QSurfaceFormat &format)
{
const int a = format.alphaBufferSize();
const int r = format.redBufferSize();
const int g = format.greenBufferSize();
const int b = format.blueBufferSize();
switch (r) {
case 4:
if (g == 4 && b == 4 && a == 4)
return R_WM_COLORFMT_ARGB4444;
break;
case 5:
if (g == 6 && b == 5 && a == 0)
return R_WM_COLORFMT_RGB565;
else if (g == 5 && b == 5 && a == 1)
return R_WM_COLORFMT_ARGB1555;
break;
case 8:
if (g == 8 && b == 8 && a == 0)
return R_WM_COLORFMT_RGB0888;
else if (g == 8 && b == 8 && a == 8)
return R_WM_COLORFMT_ARGB8888;
break;
}
qFatal("Unsupported color format: R:%d G:%d B:%d A:%d", r, g, b, a);
return R_WM_COLORFMT_LAST;
}
EGLNativeWindowType QEglFSRcarIntegration::createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format)
{
bool ok;
mNativeDisplayID = qEnvironmentVariableIntValue("QT_QPA_WM_DISP_ID", &ok);
if (!ok)
mNativeDisplayID = RCAR_DEFAULT_DISPLAY;
r_wm_Error_t wm_err = R_WM_DevInit(mNativeDisplayID);
if (wm_err != R_WM_ERR_OK)
qFatal("Failed to init WM Dev: %d, error: %d", mNativeDisplayID, wm_err);
mNativeWindow = (EGLNativeWindowTypeREL*)malloc(sizeof(EGLNativeWindowTypeREL));
memset(mNativeWindow, 0, sizeof(EGLNativeWindowTypeREL));
mNativeWindow->ColorFmt = getWMColorFormat(format);
mNativeWindow->PosX = 0;
mNativeWindow->PosY = 0;
mNativeWindow->PosZ = qEnvironmentVariableIntValue("QT_QPA_WM_LAYER", &ok);
if (!ok)
mNativeWindow->PosZ = RCAR_DEFAULT_WM_LAYER;
mNativeWindow->Pitch = size.width();
mNativeWindow->Width = size.width();
mNativeWindow->Height = size.height();
mNativeWindow->Alpha = format.alphaBufferSize();
if (format.swapBehavior() == QSurfaceFormat::DefaultSwapBehavior)
mNativeWindow->Surface.BufNum = 3;
else
mNativeWindow->Surface.BufNum = format.swapBehavior();
mNativeWindow->Surface.Type = R_WM_SURFACE_FB;
mNativeWindow->Surface.BufMode = R_WM_WINBUF_ALLOC_INTERNAL;
wm_err = R_WM_WindowCreate(mNativeDisplayID, mNativeWindow);
if (wm_err != R_WM_ERR_OK)
qFatal("Failed to create window layer: %d", wm_err);
wm_err = R_WM_DevEventRegister(mNativeDisplayID, R_WM_EVENT_VBLANK, 0);
if (wm_err != R_WM_ERR_OK)
qFatal("Failed to Register vsync event: %d", wm_err);
wm_err = R_WM_WindowEnable(mNativeDisplayID, mNativeWindow);
if (wm_err != R_WM_ERR_OK)
qFatal("Failed to Enable window surface: %d", wm_err);
return static_cast<EGLNativeWindowType>(mNativeWindow);
}
void QEglFSRcarIntegration::destroyNativeWindow(EGLNativeWindowType window)
{
R_WM_WindowDisable(mNativeDisplayID, mNativeWindow);
usleep(100000); //Needed to allow Window Manager make the window transparent
R_WM_WindowDelete(mNativeDisplayID, mNativeWindow);
R_WM_DevDeinit(mNativeDisplayID);
free(mNativeWindow);
}
QT_END_NAMESPACE

66
src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarintegration.h Normal file
View File

@ -0,0 +1,66 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QEGLFSVIVINTEGRATION_H
#define QEGLFSVIVINTEGRATION_H
#include "private/qeglfsdeviceintegration_p.h"
#include "EGL/eglext_REL.h"
QT_BEGIN_NAMESPACE
class QEglFSRcarIntegration : public QEglFSDeviceIntegration
{
public:
void platformInit() override;
QSize screenSize() const override;
EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) override;
void destroyNativeWindow(EGLNativeWindowType window) override;
EGLNativeDisplayType platformDisplay() const override;
private:
QSize mScreenSize;
EGLNativeDisplayType mNativeDisplay;
EGLNativeWindowTypeREL *mNativeWindow;
int mNativeDisplayID;
};
QT_END_NAMESPACE
#endif

57
src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarmain.cpp Normal file
View File

@ -0,0 +1,57 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "INTEGRITY.h"
#include "private/qeglfsdeviceintegration_p.h"
#include "qeglfsrcarintegration.h"
QT_BEGIN_NAMESPACE
class QEglFSRcarIntegrationPlugin : public QEglFSDeviceIntegrationPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_rcar.json")
public:
QEglFSDeviceIntegration *create() override { return new QEglFSRcarIntegration; }
};
QT_END_NAMESPACE
#include "qeglfsrcarmain.moc"