Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensource

Change-Id: Icb2df955e6a800182adde39375ffad22dd79c30d

.qmake.conf

@@ -3,4 +3,4 @@ load(qt_build_config)
 CONFIG += warning_clean
 DEFINES += QT_NO_FOREACH
 
-MODULE_VERSION = 5.15.10
+MODULE_VERSION = 5.15.11

src/render/qssgrenderframebuffer.cpp

@@ -128,6 +128,7 @@ void QSSGRenderFrameBuffer::attach(QSSGRenderFrameBufferAttachment attachment,
         if (theRelTarget != QSSGRenderTextureTargetType::Unknown && theRelTarget != target)
             m_backend->renderTargetAttach(m_bufferHandle, attachment, QSSGRenderBackend::QSSGRenderBackendTextureObject(nullptr), theRelTarget);
 
+        buffer.texture2D()->applyTextureParams();
         m_backend->renderTargetAttach(m_bufferHandle, attachment, buffer.texture2D()->handle(), target);
         // buffer.GetTexture2D()->addRef();
         m_attachmentBits |= attachmentBit;

src/render/qssgrendertexture2d.cpp

@@ -286,4 +286,12 @@ void QSSGRenderTexture2D::bind()
     applyTexSwizzle();
 }
 
+void QSSGRenderTexture2D::applyTextureParams()
+{
+    m_backend->bindTexture(m_handle, m_texTarget, 0);
+    applyTexParams();
+    applyTexSwizzle();
+    m_backend->bindTexture(0, m_texTarget, 0);
+}
+
 QT_END_NAMESPACE

src/render/qssgrendertexture2d_p.h

@@ -142,6 +142,8 @@ public:
      */
     void bind() override;
 
+    void applyTextureParams();
+
     /**
      * @brief Query if texture needs coordinate swizzle
      *