Move QuickRenderer to Deflect, use asynchronous image streaming for W…

…hiteboard (#99)
BlueBrain · Oct 31, 2016 · d7e3b04 · d7e3b04
1 parent f14df6e
commit d7e3b04
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 272 deletions.
diff --git a/.gitsubprojects b/.gitsubprojects
@@ -1,5 +1,5 @@
 # -*- mode: cmake -*-
 git_subproject(ZeroEQ https://github.com/HBPVIS/ZeroEQ.git 1019277)
-git_subproject(Deflect https://github.com/BlueBrain/Deflect.git fd77ea4)
+git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 7d2918e)
 git_subproject(TUIO https://github.com/BlueBrain/TUIO.git fdf5cf7)
 git_subproject(VirtualKeyboard https://github.com/rdumusc/QtFreeVirtualKeyboard.git e3ee94d)
diff --git a/apps/Whiteboard/Whiteboard.cpp b/apps/Whiteboard/Whiteboard.cpp
@@ -59,6 +59,7 @@ Whiteboard::Whiteboard( int& argc, char* argv[] )
  _qmlStreamer.reset( new deflect::qt::QmlStreamer( deflectQmlFile,
  deflectHost,
  deflectStreamId ));
+ _qmlStreamer->useAsyncSend( true );
 
  connect( _qmlStreamer.get(), &deflect::qt::QmlStreamer::streamClosed,
  this, &QCoreApplication::quit );

diff --git a/tide/wall/CMakeLists.txt b/tide/wall/CMakeLists.txt
@@ -9,6 +9,7 @@ set(TIDEWALL_LINK_LIBRARIES
  TideCore
  Qt5::Widgets
  PRIVATE
+ DeflectQt
  Qt5::Svg
 )
 
@@ -66,7 +67,6 @@ list(APPEND TIDEWALL_PUBLIC_HEADERS
  PixelStreamUpdater.h
  QmlWindowRenderer.h
  QuadLineNode.h
- QuickRenderer.h
  RenderController.h
  StreamImage.h
  SVGGpuImage.h
@@ -103,7 +103,6 @@ list(APPEND TIDEWALL_SOURCES
  PixelStreamUpdater.cpp
  QmlWindowRenderer.cpp
  QuadLineNode.cpp
- QuickRenderer.cpp
  RenderController.cpp
  StreamImage.cpp
  SVGGpuImage.cpp

diff --git a/tide/wall/QuickRenderer.cpp b/tide/wall/QuickRenderer.cpp
diff --git a/tide/wall/QuickRenderer.h b/tide/wall/QuickRenderer.h
diff --git a/tide/wall/TextureUploader.cpp b/tide/wall/TextureUploader.cpp
@@ -139,7 +139,7 @@ void TextureUploader::_upload( const Image& image, const uint textureID )
  // which originates from glFinish() in upload & render thread. For now
  // we use 'slow&easy' texture upload. This probably points out the problem
  // and a potential solution:
- // http://stackoverflow.com/questions/31941385/opengl-driver-seems-to-be-ridiculously-slow-from-glunmapbuffer-this-cant-be-ri
+ // http://stackoverflow.com/questions/31941385
 #if 0
  // make PBO big enough
  _gl->glBindBuffer( GL_PIXEL_UNPACK_BUFFER, _pbo );

diff --git a/tide/wall/WallWindow.cpp b/tide/wall/WallWindow.cpp
@@ -43,13 +43,14 @@
 #include "DisplayGroupRenderer.h"
 #include "log.h"
 #include "qmlUtils.h"
-#include "QuickRenderer.h"
 #include "scene/Options.h"
 #include "TestPattern.h"
 #include "TextureUploader.h"
 #include "WallConfiguration.h"
 
+#include <deflect/qt/QuickRenderer.h>
 #include <QOpenGLContext>
+#include <QOpenGLFunctions>
 #include <QQmlEngine>
 #include <QQuickRenderControl>
 #include <QThread>
@@ -66,9 +67,8 @@ WallWindow::WallWindow( const WallConfiguration& config,
  , _displayGroupRenderer( nullptr )
  , _testPattern( nullptr )
  , _wallChannel( wallChannel )
- , _glContext( new QOpenGLContext )
  , _renderControl( renderControl )
- , _quickRenderer( new QuickRenderer( *this ))
+ , _quickRenderer( new deflect::qt::QuickRenderer( *this, *_renderControl ))
  , _quickRendererThread( new QThread )
  , _qmlEngine( new QQmlEngine )
  , _qmlComponent( nullptr )
@@ -117,7 +117,6 @@ WallWindow::~WallWindow()
  delete _displayGroupRenderer;
  delete _qmlComponent;
  delete _qmlEngine;
- delete _glContext;
  delete _quickRenderer;
  delete _uploader;
 }
@@ -129,13 +128,6 @@ void WallWindow::exposeEvent( QExposeEvent* )
  // Initialize the renderer once the window is shown for correct GL context
  // realisiation
 
- QSurfaceFormat format_;
- format_.setDepthBufferSize( 16 );
- format_.setStencilBufferSize( 8 );
-
- _glContext->setFormat( format_ );
- _glContext->create();
-
  #if QT_VERSION >= 0x050500
  // Call required to make QtGraphicalEffects work in the initial scene.
  _renderControl->prepareThread( _quickRendererThread );
@@ -145,7 +137,6 @@ void WallWindow::exposeEvent( QExposeEvent* )
  "QtGraphicalEffects." );
  #endif
 
- _glContext->moveToThread( _quickRendererThread );
  _quickRenderer->moveToThread( _quickRendererThread );
 
  _quickRendererThread->setObjectName( "Render" );
@@ -157,7 +148,7 @@ void WallWindow::exposeEvent( QExposeEvent* )
  _uploadThread->setObjectName( "Upload" );
  _uploadThread->start();
 
- _uploader->init( _glContext );
+ _uploader->init( _quickRenderer->context( ));
 
  _wallChannel.globalBarrier();
  _rendererInitialized = true;
@@ -180,9 +171,16 @@ void WallWindow::_startQuick( const WallConfiguration& config )
  const QRect& screenRect = config.getScreenRect( screenIndex );
  _displayGroupRenderer = new DisplayGroupRenderer( *this, *_provider,
  screenRect );
- connect( _quickRenderer, &QuickRenderer::frameSwapped,
- _displayGroupRenderer,
- &DisplayGroupRenderer::updateRenderedFrames );
+ connect( _quickRenderer, &deflect::qt::QuickRenderer::afterRender,
+ [&]
+ {
+ _wallChannel.globalBarrier();
+ _quickRenderer->context()->swapBuffers( this );
+ _quickRenderer->context()->functions()->glFlush();
+ QMetaObject::invokeMethod( _displayGroupRenderer,
+ "updateRenderedFrames",
+ Qt::QueuedConnection );
+ });
 
  _testPattern = new TestPattern( config, _rootItem );
  _testPattern->setPosition( -screenRect.topLeft( ));
@@ -237,16 +235,6 @@ QQuickItem* WallWindow::rootObject() const
  return _rootItem;
 }
 
-QOpenGLContext& WallWindow::getOpenGLContext()
-{
- return *_glContext;
-}
-
-QQuickRenderControl& WallWindow::getRenderControl()
-{
- return *_renderControl;
-}
-
 WallToWallChannel& WallWindow::getWallChannel()
 {
  return _wallChannel;