diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-13 03:02:40 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-13 03:02:40 +0200 |
| commit | 26d2158e83a3bad9dabcd2c3ac1e95276a82277e (patch) | |
| tree | 1b0eb68d339acac36dc34fdedb647c8a7db30494 | |
| parent | e1f988f4363bcd69f1d0d47cef82503938c5638b (diff) | |
| parent | 6388eb98a12a639a263ef34553269fc36b582269 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I359b15d87622515ee4f05db1f01d4b476027378e
| -rw-r--r-- | src/render/picking/qobjectpicker.cpp | 2 | ||||
| -rw-r--r-- | src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp | 2 | ||||
| -rw-r--r-- | src/render/renderers/opengl/textures/gltexture.cpp | 7 | ||||
| -rw-r--r-- | tests/manual/downloading/main.qml | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp index a0b6d8dcd..f41ea06a6 100644 --- a/src/render/picking/qobjectpicker.cpp +++ b/src/render/picking/qobjectpicker.cpp @@ -109,6 +109,8 @@ namespace Qt3DRender { \sa PickingSettings, Geometry, Attribute, PickEvent, PickTriangleEvent + \note To receive hover events in QtQuick, the hoverEnabled property of Scene3D must also be set. + \note Instances of this component shouldn't be shared, not respecting that condition will most likely result in undefined behavior. */ diff --git a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp index 51f7cebd1..1a2971a3f 100644 --- a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp +++ b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp @@ -577,7 +577,7 @@ QSize SubmissionContext::renderTargetSize(const QSize &surfaceSize) const } else { renderTargetSize = m_surface->size(); if (m_surface->surfaceClass() == QSurface::Window) { - int dpr = static_cast<QWindow *>(m_surface)->devicePixelRatio(); + const float dpr = static_cast<QWindow *>(m_surface)->devicePixelRatio(); renderTargetSize *= dpr; } } diff --git a/src/render/renderers/opengl/textures/gltexture.cpp b/src/render/renderers/opengl/textures/gltexture.cpp index 42deb4c2a..4fd8a8a86 100644 --- a/src/render/renderers/opengl/textures/gltexture.cpp +++ b/src/render/renderers/opengl/textures/gltexture.cpp @@ -522,6 +522,13 @@ void GLTexture::uploadGLTextureData() void GLTexture::updateGLTextureParameters() { + const bool isMultisampledTexture = (m_actualTarget == QAbstractTexture::Target2DMultisample || + m_actualTarget == QAbstractTexture::Target2DMultisampleArray); + // Multisampled textures can only be accessed by texelFetch in shaders + // and don't support wrap modes and mig/mag filtes + if (isMultisampledTexture) + return; + m_gl->setWrapMode(QOpenGLTexture::DirectionS, static_cast<QOpenGLTexture::WrapMode>(m_parameters.wrapModeX)); if (m_actualTarget != QAbstractTexture::Target1D && m_actualTarget != QAbstractTexture::Target1DArray && diff --git a/tests/manual/downloading/main.qml b/tests/manual/downloading/main.qml index a78cf605e..f8631e9b1 100644 --- a/tests/manual/downloading/main.qml +++ b/tests/manual/downloading/main.qml @@ -81,7 +81,7 @@ Entity { Mesh { id: mesh - source: "https://codereview.qt-project.org/gitweb?p=qt/qt3d.git;a=blob_plain;hb=refs/heads/dev;f=examples/qt3d/exampleresources/assets/chest/Chest.obj" + source: "https://codereview.qt-project.org/gitweb?p=qt/qt3d.git;a=blob_plain;f=examples/qt3d/exampleresources/assets/obj/plane-10x10.obj" onStatusChanged: console.log("Mesh status " + status) } |