2011-04-27 10:05:43 +00:00
|
|
|
/****************************************************************************
|
|
|
|
**
|
2016-01-15 12:36:27 +00:00
|
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
|
|
** Contact: https://www.qt.io/licensing/
|
2011-04-27 10:05:43 +00:00
|
|
|
**
|
|
|
|
** This file is part of the test suite of the Qt Toolkit.
|
|
|
|
**
|
2016-01-15 12:36:27 +00:00
|
|
|
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
2012-09-19 12:28:29 +00:00
|
|
|
** 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
|
2015-01-28 08:44:43 +00:00
|
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
2016-01-15 12:36:27 +00:00
|
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
2012-09-19 12:28:29 +00:00
|
|
|
**
|
2016-01-15 12:36:27 +00:00
|
|
|
** GNU General Public License Usage
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
|
|
** General Public License version 3 as published by the Free Software
|
|
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
|
|
** 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-3.0.html.
|
2011-04-27 10:05:43 +00:00
|
|
|
**
|
|
|
|
** $QT_END_LICENSE$
|
|
|
|
**
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
#include <QtTest/QtTest>
|
|
|
|
#include <QtCore/QtCore>
|
|
|
|
#include <QtGui/QtGui>
|
2012-11-26 11:57:09 +00:00
|
|
|
#include <private/qguiapplication_p.h>
|
|
|
|
#include <qpa/qplatformintegration.h>
|
2011-08-29 12:13:08 +00:00
|
|
|
#include <QtWidgets/QApplication>
|
2011-04-27 10:05:43 +00:00
|
|
|
#include <QtOpenGL/QtOpenGL>
|
|
|
|
#include "tst_qglthreads.h"
|
|
|
|
|
2014-04-23 07:08:16 +00:00
|
|
|
#ifndef QT_OPENGL_ES_2
|
|
|
|
#include <QtGui/QOpenGLFunctions_1_0>
|
|
|
|
#endif
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
#define RUNNING_TIME 5000
|
|
|
|
|
|
|
|
tst_QGLThreads::tst_QGLThreads(QObject *parent)
|
|
|
|
: QObject(parent)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
swapInThread
|
|
|
|
|
|
|
|
The purpose of this testcase is to verify that it is possible to do rendering into
|
|
|
|
a GL context from the GUI thread, then swap the contents in from a background thread.
|
|
|
|
|
|
|
|
The usecase for this is to have the background thread do the waiting for vertical
|
|
|
|
sync while the GUI thread is idle.
|
|
|
|
|
|
|
|
Currently the locking is handled directly in the paintEvent(). For the actual usecase
|
|
|
|
in Qt, the locking is done in the windowsurface before starting any drawing while
|
|
|
|
unlocking is done after all drawing has been done.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
class SwapThread : public QThread
|
|
|
|
{
|
|
|
|
Q_OBJECT
|
|
|
|
public:
|
|
|
|
SwapThread(QGLWidget *widget)
|
2012-11-26 11:57:09 +00:00
|
|
|
: m_context(widget->context())
|
|
|
|
, m_swapTriggered(false)
|
2011-04-27 10:05:43 +00:00
|
|
|
{
|
|
|
|
moveToThread(this);
|
|
|
|
}
|
|
|
|
|
|
|
|
void run() {
|
|
|
|
QTime time;
|
|
|
|
time.start();
|
|
|
|
while (time.elapsed() < RUNNING_TIME) {
|
|
|
|
lock();
|
2012-11-26 11:57:09 +00:00
|
|
|
waitForReadyToSwap();
|
2011-04-27 10:05:43 +00:00
|
|
|
|
2012-11-26 11:57:09 +00:00
|
|
|
m_context->makeCurrent();
|
|
|
|
m_context->swapBuffers();
|
|
|
|
m_context->doneCurrent();
|
|
|
|
|
|
|
|
m_context->moveToThread(qApp->thread());
|
|
|
|
|
|
|
|
signalSwapDone();
|
2011-04-27 10:05:43 +00:00
|
|
|
unlock();
|
|
|
|
}
|
2012-11-26 11:57:09 +00:00
|
|
|
|
|
|
|
m_swapTriggered = false;
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void lock() { m_mutex.lock(); }
|
|
|
|
void unlock() { m_mutex.unlock(); }
|
|
|
|
|
2012-11-26 11:57:09 +00:00
|
|
|
void waitForSwapDone() { if (m_swapTriggered) m_swapDone.wait(&m_mutex); }
|
|
|
|
void waitForReadyToSwap() { if (!m_swapTriggered) m_readyToSwap.wait(&m_mutex); }
|
|
|
|
|
|
|
|
void signalReadyToSwap()
|
|
|
|
{
|
|
|
|
if (!isRunning())
|
|
|
|
return;
|
|
|
|
m_readyToSwap.wakeAll();
|
|
|
|
m_swapTriggered = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void signalSwapDone()
|
|
|
|
{
|
|
|
|
m_swapTriggered = false;
|
|
|
|
m_swapDone.wakeAll();
|
|
|
|
}
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
private:
|
2012-11-26 11:57:09 +00:00
|
|
|
QGLContext *m_context;
|
2011-04-27 10:05:43 +00:00
|
|
|
QMutex m_mutex;
|
2012-11-26 11:57:09 +00:00
|
|
|
QWaitCondition m_readyToSwap;
|
|
|
|
QWaitCondition m_swapDone;
|
|
|
|
|
|
|
|
bool m_swapTriggered;
|
2011-04-27 10:05:43 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
class ForegroundWidget : public QGLWidget
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
ForegroundWidget(const QGLFormat &format)
|
|
|
|
: QGLWidget(format), m_thread(0)
|
|
|
|
{
|
|
|
|
setAutoBufferSwap(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
void paintEvent(QPaintEvent *)
|
|
|
|
{
|
|
|
|
m_thread->lock();
|
2012-11-26 11:57:09 +00:00
|
|
|
m_thread->waitForSwapDone();
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
makeCurrent();
|
|
|
|
QPainter p(this);
|
|
|
|
p.fillRect(rect(), QColor(rand() % 256, rand() % 256, rand() % 256));
|
|
|
|
p.setPen(Qt::red);
|
|
|
|
p.setFont(QFont("SansSerif", 24));
|
|
|
|
p.drawText(rect(), Qt::AlignCenter, "This is an autotest");
|
|
|
|
p.end();
|
|
|
|
doneCurrent();
|
2012-11-26 11:57:09 +00:00
|
|
|
|
|
|
|
if (m_thread->isRunning()) {
|
|
|
|
context()->moveToThread(m_thread);
|
|
|
|
m_thread->signalReadyToSwap();
|
|
|
|
}
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
m_thread->unlock();
|
|
|
|
|
|
|
|
update();
|
|
|
|
}
|
|
|
|
|
|
|
|
void setThread(SwapThread *thread) {
|
|
|
|
m_thread = thread;
|
|
|
|
}
|
|
|
|
|
|
|
|
SwapThread *m_thread;
|
|
|
|
};
|
|
|
|
|
|
|
|
void tst_QGLThreads::swapInThread()
|
|
|
|
{
|
2012-11-26 11:57:09 +00:00
|
|
|
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
|
|
|
|
QSKIP("No platformsupport for ThreadedOpenGL");
|
2011-04-27 10:05:43 +00:00
|
|
|
QGLFormat format;
|
|
|
|
format.setSwapInterval(1);
|
|
|
|
ForegroundWidget widget(format);
|
|
|
|
SwapThread thread(&widget);
|
|
|
|
widget.setThread(&thread);
|
|
|
|
widget.show();
|
|
|
|
|
2012-07-24 12:29:01 +00:00
|
|
|
QVERIFY(QTest::qWaitForWindowExposed(&widget));
|
2011-04-27 10:05:43 +00:00
|
|
|
thread.start();
|
|
|
|
|
|
|
|
while (thread.isRunning()) {
|
|
|
|
qApp->processEvents();
|
|
|
|
}
|
|
|
|
|
|
|
|
widget.hide();
|
|
|
|
|
|
|
|
QVERIFY(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
textureUploadInThread
|
|
|
|
|
|
|
|
The purpose of this testcase is to verify that doing texture uploads in a background
|
|
|
|
thread is possible and that it works.
|
|
|
|
*/
|
|
|
|
|
|
|
|
class CreateAndUploadThread : public QThread
|
|
|
|
{
|
|
|
|
Q_OBJECT
|
|
|
|
public:
|
2012-11-26 11:57:09 +00:00
|
|
|
CreateAndUploadThread(QGLWidget *shareWidget, QSemaphore *semaphore)
|
|
|
|
: m_semaphore(semaphore)
|
2011-04-27 10:05:43 +00:00
|
|
|
{
|
|
|
|
m_gl = new QGLWidget(0, shareWidget);
|
|
|
|
moveToThread(this);
|
2014-03-06 10:02:48 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void moveContextToThread()
|
|
|
|
{
|
2012-11-26 11:57:09 +00:00
|
|
|
m_gl->context()->moveToThread(this);
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
~CreateAndUploadThread()
|
|
|
|
{
|
|
|
|
delete m_gl;
|
|
|
|
}
|
|
|
|
|
|
|
|
void run() {
|
|
|
|
m_gl->makeCurrent();
|
|
|
|
QTime time;
|
|
|
|
time.start();
|
|
|
|
while (time.elapsed() < RUNNING_TIME) {
|
|
|
|
int width = 400;
|
|
|
|
int height = 300;
|
|
|
|
QImage image(width, height, QImage::Format_RGB32);
|
|
|
|
QPainter p(&image);
|
|
|
|
p.fillRect(image.rect(), QColor(rand() % 256, rand() % 256, rand() % 256));
|
|
|
|
p.setPen(Qt::red);
|
|
|
|
p.setFont(QFont("SansSerif", 24));
|
|
|
|
p.drawText(image.rect(), Qt::AlignCenter, "This is an autotest");
|
|
|
|
p.end();
|
|
|
|
m_gl->bindTexture(image, GL_TEXTURE_2D, GL_RGBA, QGLContext::InternalBindOption);
|
|
|
|
|
2012-11-26 11:57:09 +00:00
|
|
|
m_semaphore->acquire(1);
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
createdAndUploaded(image);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
signals:
|
|
|
|
void createdAndUploaded(const QImage &image);
|
|
|
|
|
|
|
|
private:
|
|
|
|
QGLWidget *m_gl;
|
2012-11-26 11:57:09 +00:00
|
|
|
QSemaphore *m_semaphore;
|
2011-04-27 10:05:43 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
class TextureDisplay : public QGLWidget
|
|
|
|
{
|
|
|
|
Q_OBJECT
|
|
|
|
public:
|
2012-11-26 11:57:09 +00:00
|
|
|
TextureDisplay(QSemaphore *semaphore)
|
|
|
|
: m_semaphore(semaphore)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
void paintEvent(QPaintEvent *) {
|
|
|
|
QPainter p(this);
|
|
|
|
for (int i=0; i<m_images.size(); ++i) {
|
|
|
|
p.drawImage(m_positions.at(i), m_images.at(i));
|
|
|
|
m_positions[i] += QPoint(1, 1);
|
|
|
|
}
|
|
|
|
update();
|
|
|
|
}
|
|
|
|
|
|
|
|
public slots:
|
|
|
|
void receiveImage(const QImage &image) {
|
|
|
|
m_images << image;
|
|
|
|
m_positions << QPoint(-rand() % width() / 2, -rand() % height() / 2);
|
|
|
|
|
2012-11-26 11:57:09 +00:00
|
|
|
m_semaphore->release(1);
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
if (m_images.size() > 100) {
|
|
|
|
m_images.takeFirst();
|
|
|
|
m_positions.takeFirst();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
QList <QImage> m_images;
|
|
|
|
QList <QPoint> m_positions;
|
2012-11-26 11:57:09 +00:00
|
|
|
|
|
|
|
QSemaphore *m_semaphore;
|
2011-04-27 10:05:43 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
void tst_QGLThreads::textureUploadInThread()
|
|
|
|
{
|
2012-11-26 11:57:09 +00:00
|
|
|
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
|
|
|
|
QSKIP("No platformsupport for ThreadedOpenGL");
|
|
|
|
|
|
|
|
// prevent producer thread from queuing up too many images
|
|
|
|
QSemaphore semaphore(100);
|
|
|
|
TextureDisplay display(&semaphore);
|
|
|
|
CreateAndUploadThread thread(&display, &semaphore);
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
connect(&thread, SIGNAL(createdAndUploaded(QImage)), &display, SLOT(receiveImage(QImage)));
|
|
|
|
|
|
|
|
display.show();
|
2012-07-24 12:29:01 +00:00
|
|
|
QVERIFY(QTest::qWaitForWindowActive(&display));
|
2011-04-27 10:05:43 +00:00
|
|
|
|
2014-03-06 10:02:48 +00:00
|
|
|
thread.moveContextToThread();
|
2011-04-27 10:05:43 +00:00
|
|
|
thread.start();
|
|
|
|
|
|
|
|
while (thread.isRunning()) {
|
|
|
|
qApp->processEvents();
|
|
|
|
}
|
|
|
|
|
|
|
|
QVERIFY(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
renderInThread
|
|
|
|
|
|
|
|
This test sets up a scene and renders it in a different thread.
|
|
|
|
For simplicity, the scene is simply a bunch of rectangles, but
|
|
|
|
if that works, we're in good shape..
|
|
|
|
*/
|
|
|
|
|
|
|
|
static inline float qrandom() { return (rand() % 100) / 100.f; }
|
|
|
|
|
|
|
|
void renderAScene(int w, int h)
|
|
|
|
{
|
2014-04-23 07:08:16 +00:00
|
|
|
QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
|
|
|
|
|
2014-04-24 15:11:23 +00:00
|
|
|
if (QOpenGLContext::currentContext()->isOpenGLES()) {
|
Dynamic GL switch on Windows
The patch introduces a new build configuration on Windows which
can be requested by passing -opengl dynamic to configure.
Platforms other than Windows (including WinRT) are not affected.
The existing Angle and desktop configurations are not affected.
These continue to function as before and Angle remains the default.
In the future, when all modules have added support for the dynamic
path, as described below, the default configuration could be changed
to be the dynamic one. This would allow providing a single set of
binaries in the official builds instead of the current two.
When requesting dynamic GL, Angle is built but QT_OPENGL_ES[_2] are
never defined. Instead, the code path that has traditionally been
desktop GL only becomes the dynamic path that has to do runtime
checks. Qt modules and applications are not linked to opengl32.dll or
libegl/glesv2.dll in this case. Instead, QtGui exports all necessary
egl/egl/gl functions which will, under the hood, forward all requests
to a dynamically loaded EGL/WGL/GL implementation.
Porting guide (better said, changes needed to prepare your code to
work with dynamic GL builds when the fallback to Angle is utilized):
1. In !QT_OPENGL_ES[_2] code branches use QOpenGLFunctions::isES() to
differentiate between desktop and ES where needed. Keep in mind that
it is the desktop GL header (plus qopenglext.h) that is included,
not the GLES one.
QtGui's proxy will handle some differences, for example calling
glClearDepth will route to glClearDepthf when needed. The built-in
eglGetProcAddress is able to retrieve pointers for standard GLES2
functions too so code resolving OpenGL 2 functions will function
in any case.
2. QT_CONFIG will contain "opengl" and "dynamicgl" in dynamic builds,
but never "angle" or "opengles2".
3. The preprocessor define QT_OPENGL_DYNAMIC is also available in
dynamic builds. The usage of this is strongly discouraged and should
not be needed anywhere except for QtGui and the platform plugin.
4. Code in need of the library handle can use
QOpenGLFunctions::platformGLHandle().
The decision on which library to load is currently based on a simple
test that creates a dummy window/context and tries to resolve an
OpenGL 2 function. If this fails, it goes for Angle. This seems to work
well on Win7 PCs for example that do not have proper graphics drivers
providing OpenGL installed but are D3D9 capable using the default drivers.
Setting QT_OPENGL to desktop or angle skips the test and forces
usage of the given GL. There are also two new application attributes
that could be used for the same purpose.
If Angle is requested but the libraries are not present, desktop is
tried. If desktop is requested, or if angle is requested but nothing
works, the EGL/WGL functions will still be callable but will return 0.
This conveniently means that eglInitialize() and such will report a failure.
Debug messages can be enabled by setting QT_OPENGLPROXY_DEBUG. This will
tell which implementation is chosen.
The textures example application is ported to OpenGL 2, the GL 1
code path is removed.
[ChangeLog][QtGui] Qt builds on Windows can now be configured for
dynamic loading of the OpenGL implementation. This can be requested
by passing -opengl dynamic to configure. In this mode no modules will
link to opengl32.dll or Angle's libegl/libglesv2. Instead, QtGui will
dynamically choose between desktop and Angle during the first GL/EGL/WGL
call. This allows deploying applications with a single set of Qt libraries
with the ability of transparently falling back to Angle in case the
opengl32.dll is not suitable, due to missing graphics drivers for example.
Task-number: QTBUG-36483
Change-Id: I716fdebbf60b355b7d9ef57d1e069eef366b4ab9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-01-27 13:45:11 +00:00
|
|
|
Q_UNUSED(w);
|
|
|
|
Q_UNUSED(h);
|
|
|
|
QGLShaderProgram program;
|
|
|
|
program.addShaderFromSourceCode(QGLShader::Vertex, "attribute highp vec2 pos; void main() { gl_Position = vec4(pos.xy, 1.0, 1.0); }");
|
|
|
|
program.addShaderFromSourceCode(QGLShader::Fragment, "uniform lowp vec4 color; void main() { gl_FragColor = color; }");
|
|
|
|
program.bindAttributeLocation("pos", 0);
|
|
|
|
program.bind();
|
|
|
|
|
2014-04-23 07:08:16 +00:00
|
|
|
funcs->glEnableVertexAttribArray(0);
|
Dynamic GL switch on Windows
The patch introduces a new build configuration on Windows which
can be requested by passing -opengl dynamic to configure.
Platforms other than Windows (including WinRT) are not affected.
The existing Angle and desktop configurations are not affected.
These continue to function as before and Angle remains the default.
In the future, when all modules have added support for the dynamic
path, as described below, the default configuration could be changed
to be the dynamic one. This would allow providing a single set of
binaries in the official builds instead of the current two.
When requesting dynamic GL, Angle is built but QT_OPENGL_ES[_2] are
never defined. Instead, the code path that has traditionally been
desktop GL only becomes the dynamic path that has to do runtime
checks. Qt modules and applications are not linked to opengl32.dll or
libegl/glesv2.dll in this case. Instead, QtGui exports all necessary
egl/egl/gl functions which will, under the hood, forward all requests
to a dynamically loaded EGL/WGL/GL implementation.
Porting guide (better said, changes needed to prepare your code to
work with dynamic GL builds when the fallback to Angle is utilized):
1. In !QT_OPENGL_ES[_2] code branches use QOpenGLFunctions::isES() to
differentiate between desktop and ES where needed. Keep in mind that
it is the desktop GL header (plus qopenglext.h) that is included,
not the GLES one.
QtGui's proxy will handle some differences, for example calling
glClearDepth will route to glClearDepthf when needed. The built-in
eglGetProcAddress is able to retrieve pointers for standard GLES2
functions too so code resolving OpenGL 2 functions will function
in any case.
2. QT_CONFIG will contain "opengl" and "dynamicgl" in dynamic builds,
but never "angle" or "opengles2".
3. The preprocessor define QT_OPENGL_DYNAMIC is also available in
dynamic builds. The usage of this is strongly discouraged and should
not be needed anywhere except for QtGui and the platform plugin.
4. Code in need of the library handle can use
QOpenGLFunctions::platformGLHandle().
The decision on which library to load is currently based on a simple
test that creates a dummy window/context and tries to resolve an
OpenGL 2 function. If this fails, it goes for Angle. This seems to work
well on Win7 PCs for example that do not have proper graphics drivers
providing OpenGL installed but are D3D9 capable using the default drivers.
Setting QT_OPENGL to desktop or angle skips the test and forces
usage of the given GL. There are also two new application attributes
that could be used for the same purpose.
If Angle is requested but the libraries are not present, desktop is
tried. If desktop is requested, or if angle is requested but nothing
works, the EGL/WGL functions will still be callable but will return 0.
This conveniently means that eglInitialize() and such will report a failure.
Debug messages can be enabled by setting QT_OPENGLPROXY_DEBUG. This will
tell which implementation is chosen.
The textures example application is ported to OpenGL 2, the GL 1
code path is removed.
[ChangeLog][QtGui] Qt builds on Windows can now be configured for
dynamic loading of the OpenGL implementation. This can be requested
by passing -opengl dynamic to configure. In this mode no modules will
link to opengl32.dll or Angle's libegl/libglesv2. Instead, QtGui will
dynamically choose between desktop and Angle during the first GL/EGL/WGL
call. This allows deploying applications with a single set of Qt libraries
with the ability of transparently falling back to Angle in case the
opengl32.dll is not suitable, due to missing graphics drivers for example.
Task-number: QTBUG-36483
Change-Id: I716fdebbf60b355b7d9ef57d1e069eef366b4ab9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-01-27 13:45:11 +00:00
|
|
|
|
|
|
|
for (int i=0; i<1000; ++i) {
|
|
|
|
GLfloat pos[] = {
|
|
|
|
(rand() % 100) / 100.f,
|
|
|
|
(rand() % 100) / 100.f,
|
|
|
|
(rand() % 100) / 100.f,
|
|
|
|
(rand() % 100) / 100.f,
|
|
|
|
(rand() % 100) / 100.f,
|
|
|
|
(rand() % 100) / 100.f
|
|
|
|
};
|
|
|
|
|
2014-04-23 07:08:16 +00:00
|
|
|
funcs->glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, pos);
|
|
|
|
funcs->glDrawArrays(GL_TRIANGLE_STRIP, 0, 3);
|
Dynamic GL switch on Windows
The patch introduces a new build configuration on Windows which
can be requested by passing -opengl dynamic to configure.
Platforms other than Windows (including WinRT) are not affected.
The existing Angle and desktop configurations are not affected.
These continue to function as before and Angle remains the default.
In the future, when all modules have added support for the dynamic
path, as described below, the default configuration could be changed
to be the dynamic one. This would allow providing a single set of
binaries in the official builds instead of the current two.
When requesting dynamic GL, Angle is built but QT_OPENGL_ES[_2] are
never defined. Instead, the code path that has traditionally been
desktop GL only becomes the dynamic path that has to do runtime
checks. Qt modules and applications are not linked to opengl32.dll or
libegl/glesv2.dll in this case. Instead, QtGui exports all necessary
egl/egl/gl functions which will, under the hood, forward all requests
to a dynamically loaded EGL/WGL/GL implementation.
Porting guide (better said, changes needed to prepare your code to
work with dynamic GL builds when the fallback to Angle is utilized):
1. In !QT_OPENGL_ES[_2] code branches use QOpenGLFunctions::isES() to
differentiate between desktop and ES where needed. Keep in mind that
it is the desktop GL header (plus qopenglext.h) that is included,
not the GLES one.
QtGui's proxy will handle some differences, for example calling
glClearDepth will route to glClearDepthf when needed. The built-in
eglGetProcAddress is able to retrieve pointers for standard GLES2
functions too so code resolving OpenGL 2 functions will function
in any case.
2. QT_CONFIG will contain "opengl" and "dynamicgl" in dynamic builds,
but never "angle" or "opengles2".
3. The preprocessor define QT_OPENGL_DYNAMIC is also available in
dynamic builds. The usage of this is strongly discouraged and should
not be needed anywhere except for QtGui and the platform plugin.
4. Code in need of the library handle can use
QOpenGLFunctions::platformGLHandle().
The decision on which library to load is currently based on a simple
test that creates a dummy window/context and tries to resolve an
OpenGL 2 function. If this fails, it goes for Angle. This seems to work
well on Win7 PCs for example that do not have proper graphics drivers
providing OpenGL installed but are D3D9 capable using the default drivers.
Setting QT_OPENGL to desktop or angle skips the test and forces
usage of the given GL. There are also two new application attributes
that could be used for the same purpose.
If Angle is requested but the libraries are not present, desktop is
tried. If desktop is requested, or if angle is requested but nothing
works, the EGL/WGL functions will still be callable but will return 0.
This conveniently means that eglInitialize() and such will report a failure.
Debug messages can be enabled by setting QT_OPENGLPROXY_DEBUG. This will
tell which implementation is chosen.
The textures example application is ported to OpenGL 2, the GL 1
code path is removed.
[ChangeLog][QtGui] Qt builds on Windows can now be configured for
dynamic loading of the OpenGL implementation. This can be requested
by passing -opengl dynamic to configure. In this mode no modules will
link to opengl32.dll or Angle's libegl/libglesv2. Instead, QtGui will
dynamically choose between desktop and Angle during the first GL/EGL/WGL
call. This allows deploying applications with a single set of Qt libraries
with the ability of transparently falling back to Angle in case the
opengl32.dll is not suitable, due to missing graphics drivers for example.
Task-number: QTBUG-36483
Change-Id: I716fdebbf60b355b7d9ef57d1e069eef366b4ab9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-01-27 13:45:11 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
#ifndef QT_OPENGL_ES_2
|
2014-04-23 07:08:16 +00:00
|
|
|
QOpenGLFunctions_1_0 *gl1funcs = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_1_0>();
|
|
|
|
gl1funcs->initializeOpenGLFunctions();
|
|
|
|
|
|
|
|
gl1funcs->glViewport(0, 0, w, h);
|
Dynamic GL switch on Windows
The patch introduces a new build configuration on Windows which
can be requested by passing -opengl dynamic to configure.
Platforms other than Windows (including WinRT) are not affected.
The existing Angle and desktop configurations are not affected.
These continue to function as before and Angle remains the default.
In the future, when all modules have added support for the dynamic
path, as described below, the default configuration could be changed
to be the dynamic one. This would allow providing a single set of
binaries in the official builds instead of the current two.
When requesting dynamic GL, Angle is built but QT_OPENGL_ES[_2] are
never defined. Instead, the code path that has traditionally been
desktop GL only becomes the dynamic path that has to do runtime
checks. Qt modules and applications are not linked to opengl32.dll or
libegl/glesv2.dll in this case. Instead, QtGui exports all necessary
egl/egl/gl functions which will, under the hood, forward all requests
to a dynamically loaded EGL/WGL/GL implementation.
Porting guide (better said, changes needed to prepare your code to
work with dynamic GL builds when the fallback to Angle is utilized):
1. In !QT_OPENGL_ES[_2] code branches use QOpenGLFunctions::isES() to
differentiate between desktop and ES where needed. Keep in mind that
it is the desktop GL header (plus qopenglext.h) that is included,
not the GLES one.
QtGui's proxy will handle some differences, for example calling
glClearDepth will route to glClearDepthf when needed. The built-in
eglGetProcAddress is able to retrieve pointers for standard GLES2
functions too so code resolving OpenGL 2 functions will function
in any case.
2. QT_CONFIG will contain "opengl" and "dynamicgl" in dynamic builds,
but never "angle" or "opengles2".
3. The preprocessor define QT_OPENGL_DYNAMIC is also available in
dynamic builds. The usage of this is strongly discouraged and should
not be needed anywhere except for QtGui and the platform plugin.
4. Code in need of the library handle can use
QOpenGLFunctions::platformGLHandle().
The decision on which library to load is currently based on a simple
test that creates a dummy window/context and tries to resolve an
OpenGL 2 function. If this fails, it goes for Angle. This seems to work
well on Win7 PCs for example that do not have proper graphics drivers
providing OpenGL installed but are D3D9 capable using the default drivers.
Setting QT_OPENGL to desktop or angle skips the test and forces
usage of the given GL. There are also two new application attributes
that could be used for the same purpose.
If Angle is requested but the libraries are not present, desktop is
tried. If desktop is requested, or if angle is requested but nothing
works, the EGL/WGL functions will still be callable but will return 0.
This conveniently means that eglInitialize() and such will report a failure.
Debug messages can be enabled by setting QT_OPENGLPROXY_DEBUG. This will
tell which implementation is chosen.
The textures example application is ported to OpenGL 2, the GL 1
code path is removed.
[ChangeLog][QtGui] Qt builds on Windows can now be configured for
dynamic loading of the OpenGL implementation. This can be requested
by passing -opengl dynamic to configure. In this mode no modules will
link to opengl32.dll or Angle's libegl/libglesv2. Instead, QtGui will
dynamically choose between desktop and Angle during the first GL/EGL/WGL
call. This allows deploying applications with a single set of Qt libraries
with the ability of transparently falling back to Angle in case the
opengl32.dll is not suitable, due to missing graphics drivers for example.
Task-number: QTBUG-36483
Change-Id: I716fdebbf60b355b7d9ef57d1e069eef366b4ab9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-01-27 13:45:11 +00:00
|
|
|
|
2014-04-23 07:08:16 +00:00
|
|
|
gl1funcs->glMatrixMode(GL_PROJECTION);
|
|
|
|
gl1funcs->glLoadIdentity();
|
|
|
|
gl1funcs->glFrustum(0, w, h, 0, 1, 100);
|
|
|
|
gl1funcs->glTranslated(0, 0, -1);
|
Dynamic GL switch on Windows
The patch introduces a new build configuration on Windows which
can be requested by passing -opengl dynamic to configure.
Platforms other than Windows (including WinRT) are not affected.
The existing Angle and desktop configurations are not affected.
These continue to function as before and Angle remains the default.
In the future, when all modules have added support for the dynamic
path, as described below, the default configuration could be changed
to be the dynamic one. This would allow providing a single set of
binaries in the official builds instead of the current two.
When requesting dynamic GL, Angle is built but QT_OPENGL_ES[_2] are
never defined. Instead, the code path that has traditionally been
desktop GL only becomes the dynamic path that has to do runtime
checks. Qt modules and applications are not linked to opengl32.dll or
libegl/glesv2.dll in this case. Instead, QtGui exports all necessary
egl/egl/gl functions which will, under the hood, forward all requests
to a dynamically loaded EGL/WGL/GL implementation.
Porting guide (better said, changes needed to prepare your code to
work with dynamic GL builds when the fallback to Angle is utilized):
1. In !QT_OPENGL_ES[_2] code branches use QOpenGLFunctions::isES() to
differentiate between desktop and ES where needed. Keep in mind that
it is the desktop GL header (plus qopenglext.h) that is included,
not the GLES one.
QtGui's proxy will handle some differences, for example calling
glClearDepth will route to glClearDepthf when needed. The built-in
eglGetProcAddress is able to retrieve pointers for standard GLES2
functions too so code resolving OpenGL 2 functions will function
in any case.
2. QT_CONFIG will contain "opengl" and "dynamicgl" in dynamic builds,
but never "angle" or "opengles2".
3. The preprocessor define QT_OPENGL_DYNAMIC is also available in
dynamic builds. The usage of this is strongly discouraged and should
not be needed anywhere except for QtGui and the platform plugin.
4. Code in need of the library handle can use
QOpenGLFunctions::platformGLHandle().
The decision on which library to load is currently based on a simple
test that creates a dummy window/context and tries to resolve an
OpenGL 2 function. If this fails, it goes for Angle. This seems to work
well on Win7 PCs for example that do not have proper graphics drivers
providing OpenGL installed but are D3D9 capable using the default drivers.
Setting QT_OPENGL to desktop or angle skips the test and forces
usage of the given GL. There are also two new application attributes
that could be used for the same purpose.
If Angle is requested but the libraries are not present, desktop is
tried. If desktop is requested, or if angle is requested but nothing
works, the EGL/WGL functions will still be callable but will return 0.
This conveniently means that eglInitialize() and such will report a failure.
Debug messages can be enabled by setting QT_OPENGLPROXY_DEBUG. This will
tell which implementation is chosen.
The textures example application is ported to OpenGL 2, the GL 1
code path is removed.
[ChangeLog][QtGui] Qt builds on Windows can now be configured for
dynamic loading of the OpenGL implementation. This can be requested
by passing -opengl dynamic to configure. In this mode no modules will
link to opengl32.dll or Angle's libegl/libglesv2. Instead, QtGui will
dynamically choose between desktop and Angle during the first GL/EGL/WGL
call. This allows deploying applications with a single set of Qt libraries
with the ability of transparently falling back to Angle in case the
opengl32.dll is not suitable, due to missing graphics drivers for example.
Task-number: QTBUG-36483
Change-Id: I716fdebbf60b355b7d9ef57d1e069eef366b4ab9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-01-27 13:45:11 +00:00
|
|
|
|
2014-04-23 07:08:16 +00:00
|
|
|
gl1funcs->glMatrixMode(GL_MODELVIEW);
|
|
|
|
gl1funcs->glLoadIdentity();
|
Dynamic GL switch on Windows
The patch introduces a new build configuration on Windows which
can be requested by passing -opengl dynamic to configure.
Platforms other than Windows (including WinRT) are not affected.
The existing Angle and desktop configurations are not affected.
These continue to function as before and Angle remains the default.
In the future, when all modules have added support for the dynamic
path, as described below, the default configuration could be changed
to be the dynamic one. This would allow providing a single set of
binaries in the official builds instead of the current two.
When requesting dynamic GL, Angle is built but QT_OPENGL_ES[_2] are
never defined. Instead, the code path that has traditionally been
desktop GL only becomes the dynamic path that has to do runtime
checks. Qt modules and applications are not linked to opengl32.dll or
libegl/glesv2.dll in this case. Instead, QtGui exports all necessary
egl/egl/gl functions which will, under the hood, forward all requests
to a dynamically loaded EGL/WGL/GL implementation.
Porting guide (better said, changes needed to prepare your code to
work with dynamic GL builds when the fallback to Angle is utilized):
1. In !QT_OPENGL_ES[_2] code branches use QOpenGLFunctions::isES() to
differentiate between desktop and ES where needed. Keep in mind that
it is the desktop GL header (plus qopenglext.h) that is included,
not the GLES one.
QtGui's proxy will handle some differences, for example calling
glClearDepth will route to glClearDepthf when needed. The built-in
eglGetProcAddress is able to retrieve pointers for standard GLES2
functions too so code resolving OpenGL 2 functions will function
in any case.
2. QT_CONFIG will contain "opengl" and "dynamicgl" in dynamic builds,
but never "angle" or "opengles2".
3. The preprocessor define QT_OPENGL_DYNAMIC is also available in
dynamic builds. The usage of this is strongly discouraged and should
not be needed anywhere except for QtGui and the platform plugin.
4. Code in need of the library handle can use
QOpenGLFunctions::platformGLHandle().
The decision on which library to load is currently based on a simple
test that creates a dummy window/context and tries to resolve an
OpenGL 2 function. If this fails, it goes for Angle. This seems to work
well on Win7 PCs for example that do not have proper graphics drivers
providing OpenGL installed but are D3D9 capable using the default drivers.
Setting QT_OPENGL to desktop or angle skips the test and forces
usage of the given GL. There are also two new application attributes
that could be used for the same purpose.
If Angle is requested but the libraries are not present, desktop is
tried. If desktop is requested, or if angle is requested but nothing
works, the EGL/WGL functions will still be callable but will return 0.
This conveniently means that eglInitialize() and such will report a failure.
Debug messages can be enabled by setting QT_OPENGLPROXY_DEBUG. This will
tell which implementation is chosen.
The textures example application is ported to OpenGL 2, the GL 1
code path is removed.
[ChangeLog][QtGui] Qt builds on Windows can now be configured for
dynamic loading of the OpenGL implementation. This can be requested
by passing -opengl dynamic to configure. In this mode no modules will
link to opengl32.dll or Angle's libegl/libglesv2. Instead, QtGui will
dynamically choose between desktop and Angle during the first GL/EGL/WGL
call. This allows deploying applications with a single set of Qt libraries
with the ability of transparently falling back to Angle in case the
opengl32.dll is not suitable, due to missing graphics drivers for example.
Task-number: QTBUG-36483
Change-Id: I716fdebbf60b355b7d9ef57d1e069eef366b4ab9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-01-27 13:45:11 +00:00
|
|
|
|
|
|
|
for (int i=0;i<1000; ++i) {
|
2014-04-23 07:08:16 +00:00
|
|
|
gl1funcs->glBegin(GL_TRIANGLES);
|
|
|
|
gl1funcs->glColor3f(qrandom(), qrandom(), qrandom());
|
|
|
|
gl1funcs->glVertex2f(qrandom() * w, qrandom() * h);
|
|
|
|
gl1funcs->glColor3f(qrandom(), qrandom(), qrandom());
|
|
|
|
gl1funcs->glVertex2f(qrandom() * w, qrandom() * h);
|
|
|
|
gl1funcs->glColor3f(qrandom(), qrandom(), qrandom());
|
|
|
|
gl1funcs->glVertex2f(qrandom() * w, qrandom() * h);
|
|
|
|
gl1funcs->glEnd();
|
Dynamic GL switch on Windows
The patch introduces a new build configuration on Windows which
can be requested by passing -opengl dynamic to configure.
Platforms other than Windows (including WinRT) are not affected.
The existing Angle and desktop configurations are not affected.
These continue to function as before and Angle remains the default.
In the future, when all modules have added support for the dynamic
path, as described below, the default configuration could be changed
to be the dynamic one. This would allow providing a single set of
binaries in the official builds instead of the current two.
When requesting dynamic GL, Angle is built but QT_OPENGL_ES[_2] are
never defined. Instead, the code path that has traditionally been
desktop GL only becomes the dynamic path that has to do runtime
checks. Qt modules and applications are not linked to opengl32.dll or
libegl/glesv2.dll in this case. Instead, QtGui exports all necessary
egl/egl/gl functions which will, under the hood, forward all requests
to a dynamically loaded EGL/WGL/GL implementation.
Porting guide (better said, changes needed to prepare your code to
work with dynamic GL builds when the fallback to Angle is utilized):
1. In !QT_OPENGL_ES[_2] code branches use QOpenGLFunctions::isES() to
differentiate between desktop and ES where needed. Keep in mind that
it is the desktop GL header (plus qopenglext.h) that is included,
not the GLES one.
QtGui's proxy will handle some differences, for example calling
glClearDepth will route to glClearDepthf when needed. The built-in
eglGetProcAddress is able to retrieve pointers for standard GLES2
functions too so code resolving OpenGL 2 functions will function
in any case.
2. QT_CONFIG will contain "opengl" and "dynamicgl" in dynamic builds,
but never "angle" or "opengles2".
3. The preprocessor define QT_OPENGL_DYNAMIC is also available in
dynamic builds. The usage of this is strongly discouraged and should
not be needed anywhere except for QtGui and the platform plugin.
4. Code in need of the library handle can use
QOpenGLFunctions::platformGLHandle().
The decision on which library to load is currently based on a simple
test that creates a dummy window/context and tries to resolve an
OpenGL 2 function. If this fails, it goes for Angle. This seems to work
well on Win7 PCs for example that do not have proper graphics drivers
providing OpenGL installed but are D3D9 capable using the default drivers.
Setting QT_OPENGL to desktop or angle skips the test and forces
usage of the given GL. There are also two new application attributes
that could be used for the same purpose.
If Angle is requested but the libraries are not present, desktop is
tried. If desktop is requested, or if angle is requested but nothing
works, the EGL/WGL functions will still be callable but will return 0.
This conveniently means that eglInitialize() and such will report a failure.
Debug messages can be enabled by setting QT_OPENGLPROXY_DEBUG. This will
tell which implementation is chosen.
The textures example application is ported to OpenGL 2, the GL 1
code path is removed.
[ChangeLog][QtGui] Qt builds on Windows can now be configured for
dynamic loading of the OpenGL implementation. This can be requested
by passing -opengl dynamic to configure. In this mode no modules will
link to opengl32.dll or Angle's libegl/libglesv2. Instead, QtGui will
dynamically choose between desktop and Angle during the first GL/EGL/WGL
call. This allows deploying applications with a single set of Qt libraries
with the ability of transparently falling back to Angle in case the
opengl32.dll is not suitable, due to missing graphics drivers for example.
Task-number: QTBUG-36483
Change-Id: I716fdebbf60b355b7d9ef57d1e069eef366b4ab9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-01-27 13:45:11 +00:00
|
|
|
}
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
Dynamic GL switch on Windows
The patch introduces a new build configuration on Windows which
can be requested by passing -opengl dynamic to configure.
Platforms other than Windows (including WinRT) are not affected.
The existing Angle and desktop configurations are not affected.
These continue to function as before and Angle remains the default.
In the future, when all modules have added support for the dynamic
path, as described below, the default configuration could be changed
to be the dynamic one. This would allow providing a single set of
binaries in the official builds instead of the current two.
When requesting dynamic GL, Angle is built but QT_OPENGL_ES[_2] are
never defined. Instead, the code path that has traditionally been
desktop GL only becomes the dynamic path that has to do runtime
checks. Qt modules and applications are not linked to opengl32.dll or
libegl/glesv2.dll in this case. Instead, QtGui exports all necessary
egl/egl/gl functions which will, under the hood, forward all requests
to a dynamically loaded EGL/WGL/GL implementation.
Porting guide (better said, changes needed to prepare your code to
work with dynamic GL builds when the fallback to Angle is utilized):
1. In !QT_OPENGL_ES[_2] code branches use QOpenGLFunctions::isES() to
differentiate between desktop and ES where needed. Keep in mind that
it is the desktop GL header (plus qopenglext.h) that is included,
not the GLES one.
QtGui's proxy will handle some differences, for example calling
glClearDepth will route to glClearDepthf when needed. The built-in
eglGetProcAddress is able to retrieve pointers for standard GLES2
functions too so code resolving OpenGL 2 functions will function
in any case.
2. QT_CONFIG will contain "opengl" and "dynamicgl" in dynamic builds,
but never "angle" or "opengles2".
3. The preprocessor define QT_OPENGL_DYNAMIC is also available in
dynamic builds. The usage of this is strongly discouraged and should
not be needed anywhere except for QtGui and the platform plugin.
4. Code in need of the library handle can use
QOpenGLFunctions::platformGLHandle().
The decision on which library to load is currently based on a simple
test that creates a dummy window/context and tries to resolve an
OpenGL 2 function. If this fails, it goes for Angle. This seems to work
well on Win7 PCs for example that do not have proper graphics drivers
providing OpenGL installed but are D3D9 capable using the default drivers.
Setting QT_OPENGL to desktop or angle skips the test and forces
usage of the given GL. There are also two new application attributes
that could be used for the same purpose.
If Angle is requested but the libraries are not present, desktop is
tried. If desktop is requested, or if angle is requested but nothing
works, the EGL/WGL functions will still be callable but will return 0.
This conveniently means that eglInitialize() and such will report a failure.
Debug messages can be enabled by setting QT_OPENGLPROXY_DEBUG. This will
tell which implementation is chosen.
The textures example application is ported to OpenGL 2, the GL 1
code path is removed.
[ChangeLog][QtGui] Qt builds on Windows can now be configured for
dynamic loading of the OpenGL implementation. This can be requested
by passing -opengl dynamic to configure. In this mode no modules will
link to opengl32.dll or Angle's libegl/libglesv2. Instead, QtGui will
dynamically choose between desktop and Angle during the first GL/EGL/WGL
call. This allows deploying applications with a single set of Qt libraries
with the ability of transparently falling back to Angle in case the
opengl32.dll is not suitable, due to missing graphics drivers for example.
Task-number: QTBUG-36483
Change-Id: I716fdebbf60b355b7d9ef57d1e069eef366b4ab9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-01-27 13:45:11 +00:00
|
|
|
}
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
class ThreadSafeGLWidget : public QGLWidget
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
ThreadSafeGLWidget(QWidget *parent = 0) : QGLWidget(parent) {}
|
|
|
|
void paintEvent(QPaintEvent *)
|
|
|
|
{
|
|
|
|
// ignored as we're anyway swapping as fast as we can
|
|
|
|
};
|
|
|
|
|
|
|
|
void resizeEvent(QResizeEvent *e)
|
|
|
|
{
|
|
|
|
mutex.lock();
|
|
|
|
newSize = e->size();
|
|
|
|
mutex.unlock();
|
|
|
|
};
|
|
|
|
|
|
|
|
QMutex mutex;
|
|
|
|
QSize newSize;
|
|
|
|
};
|
|
|
|
|
|
|
|
class SceneRenderingThread : public QThread
|
|
|
|
{
|
|
|
|
Q_OBJECT
|
|
|
|
public:
|
|
|
|
SceneRenderingThread(ThreadSafeGLWidget *widget)
|
|
|
|
: m_widget(widget)
|
|
|
|
{
|
|
|
|
moveToThread(this);
|
|
|
|
m_size = widget->size();
|
|
|
|
}
|
|
|
|
|
|
|
|
void run() {
|
|
|
|
QTime time;
|
|
|
|
time.start();
|
|
|
|
failure = false;
|
|
|
|
|
|
|
|
while (time.elapsed() < RUNNING_TIME && !failure) {
|
|
|
|
|
2012-11-26 11:57:09 +00:00
|
|
|
m_widget->makeCurrent();
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
m_widget->mutex.lock();
|
|
|
|
QSize s = m_widget->newSize;
|
|
|
|
m_widget->mutex.unlock();
|
|
|
|
|
2014-04-23 07:08:16 +00:00
|
|
|
QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
|
2011-04-27 10:05:43 +00:00
|
|
|
if (s != m_size) {
|
2014-04-23 07:08:16 +00:00
|
|
|
funcs->glViewport(0, 0, s.width(), s.height());
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (QGLContext::currentContext() != m_widget->context()) {
|
|
|
|
failure = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-04-23 07:08:16 +00:00
|
|
|
funcs->glClear(GL_COLOR_BUFFER_BIT);
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
int w = m_widget->width();
|
|
|
|
int h = m_widget->height();
|
|
|
|
|
|
|
|
renderAScene(w, h);
|
|
|
|
|
|
|
|
int color;
|
2014-04-23 07:08:16 +00:00
|
|
|
funcs->glReadPixels(w / 2, h / 2, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &color);
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
m_widget->swapBuffers();
|
|
|
|
}
|
|
|
|
|
|
|
|
m_widget->doneCurrent();
|
|
|
|
}
|
|
|
|
|
|
|
|
bool failure;
|
|
|
|
|
|
|
|
private:
|
|
|
|
ThreadSafeGLWidget *m_widget;
|
|
|
|
QSize m_size;
|
|
|
|
};
|
|
|
|
|
|
|
|
void tst_QGLThreads::renderInThread_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<bool>("resize");
|
|
|
|
QTest::addColumn<bool>("update");
|
|
|
|
|
|
|
|
QTest::newRow("basic") << false << false;
|
|
|
|
QTest::newRow("with-resize") << true << false;
|
|
|
|
QTest::newRow("with-update") << false << true;
|
|
|
|
QTest::newRow("with-resize-and-update") << true << true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void tst_QGLThreads::renderInThread()
|
|
|
|
{
|
2012-11-26 11:57:09 +00:00
|
|
|
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
|
|
|
|
QSKIP("No platformsupport for ThreadedOpenGL");
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
QFETCH(bool, resize);
|
|
|
|
QFETCH(bool, update);
|
|
|
|
|
|
|
|
ThreadSafeGLWidget widget;
|
|
|
|
widget.resize(200, 200);
|
|
|
|
SceneRenderingThread thread(&widget);
|
|
|
|
|
|
|
|
widget.show();
|
2012-07-24 12:29:01 +00:00
|
|
|
QVERIFY(QTest::qWaitForWindowExposed(&widget));
|
2011-04-27 10:05:43 +00:00
|
|
|
widget.doneCurrent();
|
|
|
|
|
2012-11-26 11:57:09 +00:00
|
|
|
widget.context()->moveToThread(&thread);
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
thread.start();
|
|
|
|
|
|
|
|
int value = 10;
|
|
|
|
while (thread.isRunning()) {
|
|
|
|
if (resize)
|
|
|
|
widget.resize(200 + value, 200 + value);
|
|
|
|
if (update)
|
|
|
|
widget.update(100 + value, 100 + value, 20, 20);
|
|
|
|
qApp->processEvents();
|
|
|
|
value = -value;
|
|
|
|
|
2011-08-15 11:43:45 +00:00
|
|
|
QThread::msleep(100);
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
QVERIFY(!thread.failure);
|
|
|
|
}
|
|
|
|
|
|
|
|
class Device
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
virtual ~Device() {}
|
|
|
|
virtual QPaintDevice *realPaintDevice() = 0;
|
|
|
|
virtual void prepareDevice() {}
|
2012-11-26 11:57:09 +00:00
|
|
|
virtual void moveToThread(QThread *) {}
|
2011-04-27 10:05:43 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
class GLWidgetWrapper : public Device
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
GLWidgetWrapper() {
|
|
|
|
widget.resize(150, 150);
|
|
|
|
widget.show();
|
2012-07-24 12:29:01 +00:00
|
|
|
QTest::qWaitForWindowExposed(&widget);
|
2011-04-27 10:05:43 +00:00
|
|
|
widget.doneCurrent();
|
|
|
|
}
|
|
|
|
QPaintDevice *realPaintDevice() { return &widget; }
|
2012-11-26 11:57:09 +00:00
|
|
|
void moveToThread(QThread *thread) { widget.context()->moveToThread(thread); }
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
ThreadSafeGLWidget widget;
|
|
|
|
};
|
|
|
|
|
|
|
|
class PixmapWrapper : public Device
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
PixmapWrapper() { pixmap = new QPixmap(512, 512); }
|
|
|
|
~PixmapWrapper() { delete pixmap; }
|
|
|
|
QPaintDevice *realPaintDevice() { return pixmap; }
|
|
|
|
|
|
|
|
QPixmap *pixmap;
|
|
|
|
};
|
|
|
|
|
|
|
|
class PixelBufferWrapper : public Device
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
PixelBufferWrapper() { pbuffer = new QGLPixelBuffer(512, 512); }
|
|
|
|
~PixelBufferWrapper() { delete pbuffer; }
|
|
|
|
QPaintDevice *realPaintDevice() { return pbuffer; }
|
2012-11-26 11:57:09 +00:00
|
|
|
void moveToThread(QThread *thread) { pbuffer->context()->moveToThread(thread); }
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
QGLPixelBuffer *pbuffer;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
class FrameBufferObjectWrapper : public Device
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
FrameBufferObjectWrapper() {
|
|
|
|
widget.makeCurrent();
|
|
|
|
fbo = new QGLFramebufferObject(512, 512);
|
|
|
|
widget.doneCurrent();
|
|
|
|
}
|
|
|
|
~FrameBufferObjectWrapper() { delete fbo; }
|
|
|
|
QPaintDevice *realPaintDevice() { return fbo; }
|
|
|
|
void prepareDevice() { widget.makeCurrent(); }
|
2012-11-26 11:57:09 +00:00
|
|
|
void moveToThread(QThread *thread) { widget.context()->moveToThread(thread); }
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
ThreadSafeGLWidget widget;
|
|
|
|
QGLFramebufferObject *fbo;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
class ThreadPainter : public QObject
|
|
|
|
{
|
|
|
|
Q_OBJECT
|
|
|
|
public:
|
|
|
|
ThreadPainter(Device *pd) : device(pd), fail(true) {
|
|
|
|
pixmap = QPixmap(40, 40);
|
|
|
|
pixmap.fill(Qt::green);
|
|
|
|
QPainter p(&pixmap);
|
|
|
|
p.drawLine(0, 0, 40, 40);
|
|
|
|
p.drawLine(0, 40, 40, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
public slots:
|
|
|
|
void draw() {
|
|
|
|
bool beginFailed = false;
|
|
|
|
QTime time;
|
|
|
|
time.start();
|
|
|
|
int rotAngle = 10;
|
|
|
|
device->prepareDevice();
|
|
|
|
QPaintDevice *paintDevice = device->realPaintDevice();
|
|
|
|
QSize s(paintDevice->width(), paintDevice->height());
|
|
|
|
while (time.elapsed() < RUNNING_TIME) {
|
|
|
|
QPainter p;
|
|
|
|
if (!p.begin(paintDevice)) {
|
|
|
|
beginFailed = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
p.translate(s.width()/2, s.height()/2);
|
|
|
|
p.rotate(rotAngle);
|
|
|
|
p.translate(-s.width()/2, -s.height()/2);
|
|
|
|
p.fillRect(0, 0, s.width(), s.height(), Qt::red);
|
|
|
|
QRect rect(QPoint(0, 0), s);
|
|
|
|
p.drawPixmap(10, 10, pixmap);
|
|
|
|
p.drawTiledPixmap(50, 50, 100, 100, pixmap);
|
|
|
|
p.drawText(rect.center(), "This is a piece of text");
|
|
|
|
p.end();
|
|
|
|
rotAngle += 2;
|
2011-08-15 11:43:45 +00:00
|
|
|
QThread::msleep(20);
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
2012-11-26 11:57:09 +00:00
|
|
|
device->moveToThread(qApp->thread());
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
fail = beginFailed;
|
|
|
|
QThread::currentThread()->quit();
|
|
|
|
}
|
|
|
|
|
|
|
|
bool failed() { return fail; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
QPixmap pixmap;
|
|
|
|
Device *device;
|
|
|
|
bool fail;
|
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
class PaintThreadManager
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
PaintThreadManager(int count) : numThreads(count)
|
|
|
|
{
|
2014-03-06 10:02:48 +00:00
|
|
|
for (int i=0; i<numThreads; ++i)
|
|
|
|
devices.append(new T);
|
|
|
|
// Wait until resize events are processed on the internal
|
|
|
|
// QGLWidgets of the buffers to suppress errors
|
|
|
|
// about makeCurrent() from the wrong thread.
|
|
|
|
QCoreApplication::processEvents();
|
2011-04-27 10:05:43 +00:00
|
|
|
for (int i=0; i<numThreads; ++i) {
|
|
|
|
devices.append(new T);
|
|
|
|
threads.append(new QThread);
|
|
|
|
painters.append(new ThreadPainter(devices.at(i)));
|
|
|
|
painters.at(i)->moveToThread(threads.at(i));
|
|
|
|
painters.at(i)->connect(threads.at(i), SIGNAL(started()), painters.at(i), SLOT(draw()));
|
2012-11-26 11:57:09 +00:00
|
|
|
devices.at(i)->moveToThread(threads.at(i));
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
~PaintThreadManager() {
|
|
|
|
qDeleteAll(threads);
|
|
|
|
qDeleteAll(painters);
|
|
|
|
qDeleteAll(devices);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void start() {
|
|
|
|
for (int i=0; i<numThreads; ++i)
|
|
|
|
threads.at(i)->start();
|
|
|
|
}
|
|
|
|
|
|
|
|
bool areRunning() {
|
|
|
|
bool running = false;
|
|
|
|
for (int i=0; i<numThreads; ++i){
|
|
|
|
if (threads.at(i)->isRunning())
|
|
|
|
running = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return running;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool failed() {
|
|
|
|
for (int i=0; i<numThreads; ++i) {
|
|
|
|
if (painters.at(i)->failed())
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
QList<QThread *> threads;
|
|
|
|
QList<Device *> devices;
|
|
|
|
QList<ThreadPainter *> painters;
|
|
|
|
int numThreads;
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
This test uses QPainter to draw onto different QGLWidgets in
|
|
|
|
different threads at the same time. The ThreadSafeGLWidget is
|
|
|
|
necessary to handle paint and resize events that might come from
|
|
|
|
the main thread at any time while the test is running. The resize
|
|
|
|
and paint events would cause makeCurrent() calls to be issued from
|
|
|
|
within the QGLWidget while the widget's context was current in
|
|
|
|
another thread, which would cause errors.
|
|
|
|
*/
|
|
|
|
void tst_QGLThreads::painterOnGLWidgetInThread()
|
|
|
|
{
|
2015-06-10 10:00:42 +00:00
|
|
|
//QTBUG-46446 tst_qglthreads is unstable on windows 7
|
|
|
|
if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive))
|
|
|
|
QSKIP("Doesn't work on this platform. QTBUG-46446");
|
2012-11-26 11:57:09 +00:00
|
|
|
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
|
|
|
|
QSKIP("No platformsupport for ThreadedOpenGL");
|
2011-04-27 10:05:43 +00:00
|
|
|
if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
|
|
|
|
(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
|
2011-10-19 02:53:13 +00:00
|
|
|
QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
PaintThreadManager<GLWidgetWrapper> painterThreads(5);
|
|
|
|
painterThreads.start();
|
|
|
|
|
|
|
|
while (painterThreads.areRunning()) {
|
|
|
|
qApp->processEvents();
|
2011-08-15 11:43:45 +00:00
|
|
|
QThread::msleep(100);
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
QVERIFY(!painterThreads.failed());
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
This test uses QPainter to draw onto different QPixmaps in
|
|
|
|
different threads at the same time.
|
|
|
|
*/
|
|
|
|
void tst_QGLThreads::painterOnPixmapInThread()
|
|
|
|
{
|
2012-11-26 11:57:09 +00:00
|
|
|
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)
|
|
|
|
|| !QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedPixmaps))
|
|
|
|
QSKIP("No platformsupport for ThreadedOpenGL or ThreadedPixmaps");
|
2016-10-13 13:54:23 +00:00
|
|
|
#if 0 // Used to be included in Qt4 for Q_WS_X11
|
2011-10-19 02:53:13 +00:00
|
|
|
QSKIP("Drawing text in threads onto X11 drawables currently crashes on some X11 servers.");
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
|
|
|
PaintThreadManager<PixmapWrapper> painterThreads(5);
|
|
|
|
painterThreads.start();
|
|
|
|
|
|
|
|
while (painterThreads.areRunning()) {
|
|
|
|
qApp->processEvents();
|
2011-08-15 11:43:45 +00:00
|
|
|
QThread::msleep(100);
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
QVERIFY(!painterThreads.failed());
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This test uses QPainter to draw onto different QGLPixelBuffer
|
|
|
|
objects in different threads at the same time.
|
|
|
|
*/
|
|
|
|
void tst_QGLThreads::painterOnPboInThread()
|
|
|
|
{
|
2015-06-10 10:00:42 +00:00
|
|
|
//QTBUG-46446 tst_qglthreads is unstable on windows 7
|
|
|
|
if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive))
|
|
|
|
QSKIP("Doesn't work on this platform. QTBUG-46446");
|
2012-11-26 11:57:09 +00:00
|
|
|
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
|
|
|
|
QSKIP("No platformsupport for ThreadedOpenGL");
|
2011-04-27 10:05:43 +00:00
|
|
|
if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
|
|
|
|
(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
|
2011-10-19 02:53:13 +00:00
|
|
|
QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!QGLPixelBuffer::hasOpenGLPbuffers()) {
|
2011-10-19 02:53:13 +00:00
|
|
|
QSKIP("This system doesn't support pbuffers.");
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
PaintThreadManager<PixelBufferWrapper> painterThreads(5);
|
|
|
|
painterThreads.start();
|
|
|
|
|
|
|
|
while (painterThreads.areRunning()) {
|
|
|
|
qApp->processEvents();
|
2011-08-15 11:43:45 +00:00
|
|
|
QThread::msleep(100);
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
QVERIFY(!painterThreads.failed());
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This test uses QPainter to draw onto different
|
|
|
|
QGLFramebufferObjects (bound in a QGLWidget's context) in different
|
|
|
|
threads at the same time.
|
|
|
|
*/
|
|
|
|
void tst_QGLThreads::painterOnFboInThread()
|
|
|
|
{
|
2015-06-10 10:00:42 +00:00
|
|
|
//QTBUG-46446 tst_qglthreads is unstable on windows 7
|
|
|
|
if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive))
|
|
|
|
QSKIP("Doesn't work on this platform. QTBUG-46446");
|
2012-11-26 11:57:09 +00:00
|
|
|
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
|
|
|
|
QSKIP("No platformsupport for ThreadedOpenGL");
|
2011-04-27 10:05:43 +00:00
|
|
|
if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
|
|
|
|
(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
|
2011-10-19 02:53:13 +00:00
|
|
|
QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!QGLFramebufferObject::hasOpenGLFramebufferObjects()) {
|
2011-10-19 02:53:13 +00:00
|
|
|
QSKIP("This system doesn't support framebuffer objects.");
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
PaintThreadManager<FrameBufferObjectWrapper> painterThreads(5);
|
|
|
|
painterThreads.start();
|
|
|
|
|
|
|
|
while (painterThreads.areRunning()) {
|
|
|
|
qApp->processEvents();
|
2011-08-15 11:43:45 +00:00
|
|
|
QThread::msleep(100);
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
QVERIFY(!painterThreads.failed());
|
|
|
|
}
|
|
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
QApplication app(argc, argv);
|
|
|
|
QTEST_DISABLE_KEYPAD_NAVIGATION \
|
|
|
|
|
|
|
|
tst_QGLThreads tc;
|
|
|
|
return QTest::qExec(&tc, argc, argv);
|
|
|
|
}
|
|
|
|
|
|
|
|
#include "tst_qglthreads.moc"
|