diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:09:05 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:09:05 +0300 |
| commit | 18711bd8a1df79c3fbbfc408aa3478eed0772988 (patch) | |
| tree | 2b5eff01d71e0a3793aa9ceb92221a8805fcc2f8 | |
| parent | b485a86d895a05c7a254ce7d4b666c5a04e50344 (diff) | |
| parent | aaa458855a45355518f21adf926744ba0a06d3f1 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl
Change-Id: Icb2df955e6a800182adde39375ffad22dd79c30d
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/render/qssgrenderframebuffer.cpp | 1 | ||||
| -rw-r--r-- | src/render/qssgrendertexture2d.cpp | 8 | ||||
| -rw-r--r-- | src/render/qssgrendertexture2d_p.h | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 92c6c65f..9228cbd1 100644 --- a/.qmake.conf +++ b/.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 diff --git a/src/render/qssgrenderframebuffer.cpp b/src/render/qssgrenderframebuffer.cpp index c8770b22..91f7ef65 100644 --- a/src/render/qssgrenderframebuffer.cpp +++ b/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; diff --git a/src/render/qssgrendertexture2d.cpp b/src/render/qssgrendertexture2d.cpp index 2231c540..67046bf4 100644 --- a/src/render/qssgrendertexture2d.cpp +++ b/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 diff --git a/src/render/qssgrendertexture2d_p.h b/src/render/qssgrendertexture2d_p.h index d238fdee..ad2e8bce 100644 --- a/src/render/qssgrendertexture2d_p.h +++ b/src/render/qssgrendertexture2d_p.h @@ -142,6 +142,8 @@ public: */ void bind() override; + void applyTextureParams(); + /** * @brief Query if texture needs coordinate swizzle * |