From 853d2edf9158b4237a963f04cc7f4b58e0315f4b Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Wed, 7 Aug 2019 07:37:35 +0200 Subject: submissioncontext fix: devicePixelRatio is not an integer Converting it to int would cause the viewport not to take the whole expected size as the interger conversion would essentially floor the value. Change-Id: Ic608b0e1a0910aadb8b98c3225f999cba6326535 Reviewed-by: Mike Krus --- src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp index 59c2d4286..daf6db717 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(m_surface)->devicePixelRatio(); + const float dpr = static_cast(m_surface)->devicePixelRatio(); renderTargetSize *= dpr; } } -- cgit v1.2.3 From fcf6017b82868c044c8d06ca8092ab8acfe56070 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Tue, 23 Jul 2019 14:01:18 +0200 Subject: GLTexture: glTexParam is not supported on multisampled textures So try to avoid performing these calls on such texture Change-Id: I051fd6a0150d07656687a1f84756d8a3d506ec24 Reviewed-by: Mike Krus --- src/render/renderers/opengl/textures/gltexture.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/render/renderers/opengl/textures/gltexture.cpp b/src/render/renderers/opengl/textures/gltexture.cpp index ce212de03..27b94882a 100644 --- a/src/render/renderers/opengl/textures/gltexture.cpp +++ b/src/render/renderers/opengl/textures/gltexture.cpp @@ -495,6 +495,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(m_parameters.wrapModeX)); if (m_actualTarget != QAbstractTexture::Target1D && m_actualTarget != QAbstractTexture::Target1DArray && -- cgit v1.2.3 From 4c8dfd84feddee954f048f8ab3366d4d6176c788 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Mon, 29 Jul 2019 15:42:40 +0100 Subject: Fix download test after removal of assets Change-Id: Id7f37b014dec7f395bbf3d2c6c22ea59283257ec Reviewed-by: Paul Lemire --- tests/manual/downloading/main.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) } -- cgit v1.2.3 From 6388eb98a12a639a263ef34553269fc36b582269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Wed, 7 Aug 2019 16:09:14 +0200 Subject: Improve documentation of ObjectPicker Add a reference to Scene3D hoverEnabled Change-Id: I59e282a985ae5af30ff22d7caf433fb3b7cd821b Reviewed-by: Mike Krus --- src/render/picking/qobjectpicker.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp index c3671d018..e15a7cdfc 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. */ -- cgit v1.2.3