Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I53aa6c3f61b1f624ec553079a9332c96486abf3f

1 files changed, 7 insertions, 0 deletions

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 &&