From 6385a182f0f93820c96cf274e50a56492491ee10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Mon, 26 Nov 2012 12:57:09 +0100 Subject: Added explicit threading API to QtOpenGL. Since QtOpenGL/QGLContext is implemented in terms of QtGui/QOpenGLContext which has stricter requirements about how it's supposed to be used, we need to apply these requirements to QGLContext as well. This change adds QGLContext::moveToThread(QThread *) and documents it as a necessity for making a context current on another thread. Also introduces QGLPixelbuffer::context() to access the QGLContext of a pixelbuffer, and made QGLWidget::context() return a non-const QGLContext, since there's no good reason why it shouldn't, and it leads to less const_cast clutter. We could have introduced a backdoor in QOpenGLContext instead, making it loosen its requirements, but that would have made it harder / impossible to fully support threaded OpenGL in all the platforms. Task-number: QTBUG-22560 Change-Id: Ibb6f65f342e7c963e80cc42ab5664c5f1cab30b0 Reviewed-by: Friedemann Kleint Reviewed-by: Gunnar Sletta --- tests/auto/opengl/qglthreads/qglthreads.pro | 5 +- tests/auto/opengl/qglthreads/tst_qglthreads.cpp | 103 ++++++++++++++++++++---- 2 files changed, 91 insertions(+), 17 deletions(-) (limited to 'tests') diff --git a/tests/auto/opengl/qglthreads/qglthreads.pro b/tests/auto/opengl/qglthreads/qglthreads.pro index 754f494cfa..d5cbd0d9ed 100644 --- a/tests/auto/opengl/qglthreads/qglthreads.pro +++ b/tests/auto/opengl/qglthreads/qglthreads.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qglthreads requires(contains(QT_CONFIG,opengl)) -QT += opengl widgets testlib +QT += opengl widgets testlib gui-private core-private HEADERS += tst_qglthreads.h SOURCES += tst_qglthreads.cpp @@ -10,5 +10,6 @@ x11 { LIBS += $$QMAKE_LIBS_X11 } -CONFIG+=insignificant_test # QTBUG-22560 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +win32:CONFIG+=insignificant_test # QTBUG-28264 diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp index 267e3260f1..8535f177cd 100644 --- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp @@ -42,6 +42,8 @@ #include #include #include +#include +#include #include #include #include "tst_qglthreads.h" @@ -74,7 +76,8 @@ class SwapThread : public QThread Q_OBJECT public: SwapThread(QGLWidget *widget) - : m_widget(widget) + : m_context(widget->context()) + , m_swapTriggered(false) { moveToThread(this); } @@ -84,25 +87,48 @@ public: time.start(); while (time.elapsed() < RUNNING_TIME) { lock(); - wait(); + waitForReadyToSwap(); - m_widget->makeCurrent(); - m_widget->swapBuffers(); - m_widget->doneCurrent(); + m_context->makeCurrent(); + m_context->swapBuffers(); + m_context->doneCurrent(); + + m_context->moveToThread(qApp->thread()); + + signalSwapDone(); unlock(); } + + m_swapTriggered = false; } void lock() { m_mutex.lock(); } void unlock() { m_mutex.unlock(); } - void wait() { m_wait_condition.wait(&m_mutex); } - void notify() { m_wait_condition.wakeAll(); } + 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(); + } private: - QGLWidget *m_widget; + QGLContext *m_context; QMutex m_mutex; - QWaitCondition m_wait_condition; + QWaitCondition m_readyToSwap; + QWaitCondition m_swapDone; + + bool m_swapTriggered; }; class ForegroundWidget : public QGLWidget @@ -117,6 +143,8 @@ public: void paintEvent(QPaintEvent *) { m_thread->lock(); + m_thread->waitForSwapDone(); + makeCurrent(); QPainter p(this); p.fillRect(rect(), QColor(rand() % 256, rand() % 256, rand() % 256)); @@ -125,7 +153,12 @@ public: p.drawText(rect(), Qt::AlignCenter, "This is an autotest"); p.end(); doneCurrent(); - m_thread->notify(); + + if (m_thread->isRunning()) { + context()->moveToThread(m_thread); + m_thread->signalReadyToSwap(); + } + m_thread->unlock(); update(); @@ -140,6 +173,8 @@ public: void tst_QGLThreads::swapInThread() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)) + QSKIP("No platformsupport for ThreadedOpenGL"); QGLFormat format; format.setSwapInterval(1); ForegroundWidget widget(format); @@ -176,10 +211,12 @@ class CreateAndUploadThread : public QThread { Q_OBJECT public: - CreateAndUploadThread(QGLWidget *shareWidget) + CreateAndUploadThread(QGLWidget *shareWidget, QSemaphore *semaphore) + : m_semaphore(semaphore) { m_gl = new QGLWidget(0, shareWidget); moveToThread(this); + m_gl->context()->moveToThread(this); } ~CreateAndUploadThread() @@ -203,6 +240,8 @@ public: p.end(); m_gl->bindTexture(image, GL_TEXTURE_2D, GL_RGBA, QGLContext::InternalBindOption); + m_semaphore->acquire(1); + createdAndUploaded(image); } } @@ -212,12 +251,18 @@ signals: private: QGLWidget *m_gl; + QSemaphore *m_semaphore; }; class TextureDisplay : public QGLWidget { Q_OBJECT public: + TextureDisplay(QSemaphore *semaphore) + : m_semaphore(semaphore) + { + } + void paintEvent(QPaintEvent *) { QPainter p(this); for (int i=0; irelease(1); + if (m_images.size() > 100) { m_images.takeFirst(); m_positions.takeFirst(); @@ -241,12 +288,19 @@ public slots: private: QList m_images; QList m_positions; + + QSemaphore *m_semaphore; }; void tst_QGLThreads::textureUploadInThread() { - TextureDisplay display; - CreateAndUploadThread thread(&display); + 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); connect(&thread, SIGNAL(createdAndUploaded(QImage)), &display, SLOT(receiveImage(QImage))); @@ -362,10 +416,9 @@ public: time.start(); failure = false; - m_widget->makeCurrent(); - while (time.elapsed() < RUNNING_TIME && !failure) { + m_widget->makeCurrent(); m_widget->mutex.lock(); QSize s = m_widget->newSize; @@ -416,6 +469,8 @@ void tst_QGLThreads::renderInThread_data() void tst_QGLThreads::renderInThread() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)) + QSKIP("No platformsupport for ThreadedOpenGL"); QFETCH(bool, resize); QFETCH(bool, update); @@ -428,6 +483,8 @@ void tst_QGLThreads::renderInThread() QVERIFY(QTest::qWaitForWindowExposed(&widget)); widget.doneCurrent(); + widget.context()->moveToThread(&thread); + thread.start(); int value = 10; @@ -451,6 +508,7 @@ public: virtual ~Device() {} virtual QPaintDevice *realPaintDevice() = 0; virtual void prepareDevice() {} + virtual void moveToThread(QThread *) {} }; class GLWidgetWrapper : public Device @@ -463,6 +521,7 @@ public: widget.doneCurrent(); } QPaintDevice *realPaintDevice() { return &widget; } + void moveToThread(QThread *thread) { widget.context()->moveToThread(thread); } ThreadSafeGLWidget widget; }; @@ -483,6 +542,7 @@ public: PixelBufferWrapper() { pbuffer = new QGLPixelBuffer(512, 512); } ~PixelBufferWrapper() { delete pbuffer; } QPaintDevice *realPaintDevice() { return pbuffer; } + void moveToThread(QThread *thread) { pbuffer->context()->moveToThread(thread); } QGLPixelBuffer *pbuffer; }; @@ -499,6 +559,7 @@ public: ~FrameBufferObjectWrapper() { delete fbo; } QPaintDevice *realPaintDevice() { return fbo; } void prepareDevice() { widget.makeCurrent(); } + void moveToThread(QThread *thread) { widget.context()->moveToThread(thread); } ThreadSafeGLWidget widget; QGLFramebufferObject *fbo; @@ -545,6 +606,8 @@ public slots: QThread::msleep(20); } + device->moveToThread(qApp->thread()); + fail = beginFailed; QThread::currentThread()->quit(); } @@ -569,6 +632,7 @@ public: 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())); + devices.at(i)->moveToThread(threads.at(i)); } } @@ -621,6 +685,8 @@ private: */ void tst_QGLThreads::painterOnGLWidgetInThread() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)) + QSKIP("No platformsupport for ThreadedOpenGL"); if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) || (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) { QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0."); @@ -642,6 +708,9 @@ void tst_QGLThreads::painterOnGLWidgetInThread() */ void tst_QGLThreads::painterOnPixmapInThread() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL) + || !QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedPixmaps)) + QSKIP("No platformsupport for ThreadedOpenGL or ThreadedPixmaps"); #ifdef Q_WS_X11 QSKIP("Drawing text in threads onto X11 drawables currently crashes on some X11 servers."); #endif @@ -660,6 +729,8 @@ void tst_QGLThreads::painterOnPixmapInThread() */ void tst_QGLThreads::painterOnPboInThread() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)) + QSKIP("No platformsupport for ThreadedOpenGL"); if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) || (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) { QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0."); @@ -685,6 +756,8 @@ void tst_QGLThreads::painterOnPboInThread() */ void tst_QGLThreads::painterOnFboInThread() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)) + QSKIP("No platformsupport for ThreadedOpenGL"); if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) || (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) { QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0."); -- cgit v1.2.3