diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-03 03:02:21 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-03 03:02:22 +0100 |
| commit | a3761a118f07dd3d4bebc3b28fff01b5f91a0016 (patch) | |
| tree | 31d1eb9c7828f078ae0ef92d72e7cea53aa5d4ec /src/render/renderers | |
| parent | 07bb9b2cd65b22027fe5105d692a4ee265f59842 (diff) | |
| parent | 7b401dcd3345d42108eb162ea354f64152c9d0a4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I95431b48ee9828be602c088cdd798fabbd1723ef
Diffstat (limited to 'src/render/renderers')
| -rw-r--r-- | src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp | 7 | ||||
| -rw-r--r-- | src/render/renderers/opengl/renderer/renderer.cpp | 3 | ||||
| -rw-r--r-- | src/render/renderers/opengl/textures/gltexture.cpp | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp index 7900db879..71bd6aa9c 100644 --- a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp +++ b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp @@ -76,6 +76,7 @@ #include <Qt3DRender/private/graphicshelperes2_p.h> #include <Qt3DRender/private/graphicshelperes3_p.h> +#include <private/qdebug_p.h> #include <QSurface> #include <QWindow> #include <QOpenGLTexture> @@ -707,8 +708,10 @@ QImage SubmissionContext::readFramebuffer(const QRect &rect) break; #endif default: - // unsupported format - Q_UNREACHABLE(); + auto warning = qWarning(); + warning << "Unable to convert"; + QtDebugUtils::formatQEnum(warning, m_renderTargetFormat); + warning << "render target texture format to QImage."; return img; } diff --git a/src/render/renderers/opengl/renderer/renderer.cpp b/src/render/renderers/opengl/renderer/renderer.cpp index d71256484..d270dc583 100644 --- a/src/render/renderers/opengl/renderer/renderer.cpp +++ b/src/render/renderers/opengl/renderer/renderer.cpp @@ -107,6 +107,7 @@ #include <QSurface> #include <QElapsedTimer> #include <QLibraryInfo> +#include <QMutexLocker> #include <QPluginLoader> #include <QDir> #include <QUrl> @@ -447,8 +448,10 @@ void Renderer::shutdown() // We delete any renderqueue that we may not have had time to render // before the surface was destroyed + QMutexLocker lockRenderQueue(m_renderQueue->mutex()); qDeleteAll(m_renderQueue->nextFrameQueue()); m_renderQueue->reset(); + lockRenderQueue.unlock(); m_commandThread->shutdown(); diff --git a/src/render/renderers/opengl/textures/gltexture.cpp b/src/render/renderers/opengl/textures/gltexture.cpp index 2fe0e99c1..1d2d19c66 100644 --- a/src/render/renderers/opengl/textures/gltexture.cpp +++ b/src/render/renderers/opengl/textures/gltexture.cpp @@ -40,6 +40,7 @@ #include <QtCore/qhash.h> #include "gltexture_p.h" +#include <private/qdebug_p.h> #include <QDebug> #include <QOpenGLFunctions> #include <QOpenGLTexture> @@ -410,7 +411,9 @@ QOpenGLTexture *GLTexture::buildGLTexture() format = QAbstractTexture::DepthFormat; break; default: - qWarning() << Q_FUNC_INFO << "could not find a matching OpenGL ES 2.0 unsized texture format"; + auto warning = qWarning(); + warning << "Could not find a matching OpenGL ES 2.0 texture format:"; + QtDebugUtils::formatQEnum(warning, m_properties.format); break; } } |