e453484bca
QOpenGLWidget is now public. In addition Qt::WA_AlwaysStackOnTop is introduced to support the special case of semi-transparent QOpenGLWidget or QQuickWidget on top of regular widgets. hellogl_es2 becomes the qopenglwidget example. This example performs painting both via QPainter and native GL commands and has the OpenGL widget combined with other, normal widgets. The widget stack receives some changes when it comes to renderToTexture widgets like QQuickWidget and QOpenGLWidget. Calling update() will now result in a paint event, which is essential for QOpenGLWidget since we want it to behave like a regular widget. The dirty region handling is extended specially for such widgets due to performance reasons. (an OpenGL content update must not result in any backingstore painting, and is thus handled as a different kind of dirtiness) [ChangeLog] Added QOpenGLWidget. This widget serves as a replacement for QGLWidget. Task-number: QTBUG-36899 Task-number: QTBUG-40086 Change-Id: Ibf7f82fea99b39edfffd2fc088e7e0eadbca25cf Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
89 lines
3.0 KiB
C++
89 lines
3.0 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/legal
|
|
**
|
|
** This file is part of the test suite 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 Digia. For licensing terms and
|
|
** conditions see http://qt.digia.com/licensing. For further information
|
|
** use the contact form at http://qt.digia.com/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 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, Digia gives you certain additional
|
|
** rights. These rights are described in the Digia 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.
|
|
**
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "openglwidget.h"
|
|
#include <QApplication>
|
|
#include <QPushButton>
|
|
#include <QMdiArea>
|
|
#include <QLCDNumber>
|
|
#include <QTimer>
|
|
#include <QSurfaceFormat>
|
|
#include <QDebug>
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
QApplication a(argc, argv);
|
|
|
|
QSurfaceFormat format;
|
|
if (QCoreApplication::arguments().contains(QLatin1String("--multisample")))
|
|
format.setSamples(4);
|
|
if (QCoreApplication::arguments().contains(QLatin1String("--coreprofile"))) {
|
|
format.setVersion(3, 2);
|
|
format.setProfile(QSurfaceFormat::CoreProfile);
|
|
}
|
|
qDebug() << "Requesting" << format;
|
|
|
|
QMdiArea w;
|
|
w.resize(400,400);
|
|
|
|
OpenGLWidget *glw = new OpenGLWidget;
|
|
glw->setFormat(format);
|
|
w.addSubWindow(glw);
|
|
glw->setMinimumSize(100,100);
|
|
|
|
OpenGLWidget *glw2 = new OpenGLWidget;
|
|
glw2->setFormat(format);
|
|
glw2->setMinimumSize(100,100);
|
|
w.addSubWindow(glw2);
|
|
|
|
QLCDNumber *lcd = new QLCDNumber;
|
|
lcd->display(1337);
|
|
lcd->setMinimumSize(300,100);
|
|
w.addSubWindow(lcd);
|
|
|
|
w.show();
|
|
|
|
if (glw->isValid())
|
|
qDebug() << "Got" << glw->format();
|
|
|
|
return a.exec();
|
|
}
|