diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-08-20 07:00:50 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-08-20 07:01:01 +0200 |
| commit | 362f13e62c13f2eedc61b6ad357257b320db6307 (patch) | |
| tree | 7aa999cac1905867ffcd06b216aca62d842d0330 | |
| parent | 3dcc9719808a77ab644921df38ea82c268ea7a97 (diff) | |
| parent | b669a0d133b027091117ecccd9e47aa8086ef4ff (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I53aa6c3f61b1f624ec553079a9332c96486abf3f
| -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 6dde055f6..9537d4982 100644 --- a/src/render/picking/qobjectpicker.cpp +++ b/src/render/picking/qobjectpicker.cpp @@ -111,6 +111,8 @@ namespace Qt3DRender { \sa PickingSettings, Geometry, Attribute, PickEvent, PickTriangleEvent, NoPicking + \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 028fd607a..bedc7f61c 100644 --- a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp +++ b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp @@ -589,7 +589,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 7a49304e3..93348d0b0 100644 --- a/src/render/renderers/opengl/textures/gltexture.cpp +++ b/src/render/renderers/opengl/textures/gltexture.cpp @@ -623,6 +623,13 @@ void GLTexture::uploadGLTextureData() void GLTexture::updateGLTextureParameters() { const QAbstractTexture::Target actualTarget = m_properties.target; + const bool isMultisampledTexture = (actualTarget == QAbstractTexture::Target2DMultisample || + 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 (actualTarget != QAbstractTexture::Target1D && 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) } |