From ba5dd0d6c04233fa08aaa1a1813b0c122199c7a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Wed, 15 Feb 2012 17:08:20 +0100 Subject: Added QPlatformScreenBuffer And moved the pageflipper into its own file Done with: Paul Change-Id: I0af34075ce8673a66025cb761c0fe4ff6c0ab0fe Reviewed-by: Jason Barron --- src/gui/kernel/kernel.pri | 6 +- src/gui/kernel/qplatformscreen_qpa.h | 11 +-- src/gui/kernel/qplatformscreenpageflipper_qpa.cpp | 83 +++++++++++++++++++++ src/gui/kernel/qplatformscreenpageflipper_qpa.h | 87 +++++++++++++++++++++++ 4 files changed, 175 insertions(+), 12 deletions(-) create mode 100644 src/gui/kernel/qplatformscreenpageflipper_qpa.cpp create mode 100644 src/gui/kernel/qplatformscreenpageflipper_qpa.h (limited to 'src/gui') diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 2656d8ffdb..06773f58b5 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -56,7 +56,8 @@ HEADERS += \ kernel/qtouchdevice_p.h \ kernel/qplatformsharedgraphicscache_qpa.h \ kernel/qplatformdialoghelper_qpa.h \ - kernel/qplatformservices_qpa.h + kernel/qplatformservices_qpa.h \ + kernel/qplatformscreenpageflipper_qpa.h SOURCES += \ kernel/qclipboard_qpa.cpp \ @@ -100,7 +101,8 @@ SOURCES += \ kernel/qtouchdevice.cpp \ kernel/qplatformsharedgraphicscache_qpa.cpp \ kernel/qplatformdialoghelper_qpa.cpp \ - kernel/qplatformservices_qpa.cpp + kernel/qplatformservices_qpa.cpp \ + kernel/qplatformscreenpageflipper_qpa.cpp contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2)|contains(QT_CONFIG, egl) { HEADERS += \ diff --git a/src/gui/kernel/qplatformscreen_qpa.h b/src/gui/kernel/qplatformscreen_qpa.h index e4b9b762b1..7d74698074 100644 --- a/src/gui/kernel/qplatformscreen_qpa.h +++ b/src/gui/kernel/qplatformscreen_qpa.h @@ -63,21 +63,12 @@ class QPlatformBackingStore; class QPlatformOpenGLContext; class QPlatformScreenPrivate; class QPlatformWindow; +class QPlatformScreenPageFlipper; class QScreen; class QSurfaceFormat; typedef QPair QDpi; -class Q_GUI_EXPORT QPlatformScreenPageFlipper : public QObject -{ - Q_OBJECT -public: - virtual bool displayBuffer(void *bufferHandle) = 0; - - signals: - void bufferDisplayed(void *bufferHandle); - void bufferReleased(void *bufferHandle); -}; class Q_GUI_EXPORT QPlatformScreen { diff --git a/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp b/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp new file mode 100644 index 0000000000..d652e34e5e --- /dev/null +++ b/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtGui module 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 "qplatformscreenpageflipper_qpa.h" + +QT_BEGIN_NAMESPACE + +QPlatformScreenBuffer::QPlatformScreenBuffer() + : m_destroyed(false) + , m_ready(true) +{ + +} + +QPlatformScreenBuffer::~QPlatformScreenBuffer() +{ + +} + +bool QPlatformScreenBuffer::isDestroyed() const +{ + return m_destroyed; +} + +bool QPlatformScreenBuffer::isReady() const +{ + return m_ready; +} + +void QPlatformScreenBuffer::aboutToBeDisplayed() +{ +} + +void QPlatformScreenBuffer::displayed() +{ +} + +QPlatformScreenPageFlipper::QPlatformScreenPageFlipper(QObject *parent) + :QObject(parent) +{ + +} + +QT_END_NAMESPACE + diff --git a/src/gui/kernel/qplatformscreenpageflipper_qpa.h b/src/gui/kernel/qplatformscreenpageflipper_qpa.h new file mode 100644 index 0000000000..850f9d8d2f --- /dev/null +++ b/src/gui/kernel/qplatformscreenpageflipper_qpa.h @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtGui module 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 QPLATFORMSCREENPAGEFLIPPER_QPA_H +#define QPLATFORMSCREENPAGEFLIPPER_QPA_H + +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +class Q_GUI_EXPORT QPlatformScreenBuffer { +public: + QPlatformScreenBuffer(); + virtual ~QPlatformScreenBuffer(); + + bool isDestroyed() const; + bool isReady() const; + + virtual void aboutToBeDisplayed(); + virtual void displayed(); + virtual void release() = 0; + + virtual void *handle() const = 0; + +protected: + bool m_destroyed; + bool m_ready; +}; + +class Q_GUI_EXPORT QPlatformScreenPageFlipper : public QObject +{ + Q_OBJECT +public: + explicit QPlatformScreenPageFlipper(QObject *parent = 0); + + virtual bool displayBuffer(QPlatformScreenBuffer *) = 0; + +signals: + void bufferDisplayed(QPlatformScreenBuffer *); + void bufferReleased(QPlatformScreenBuffer *); +}; + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QPLATFORMSCREENPAGEFLIPPER_QPA_H -- cgit v1.2.3