Rescale on rhi path too when NPoT textures not supported

QRhi will not do this for us. Also handle mipmap filtering correctly
in this regard.

This will fix rendering on WebAssembly.

Change-Id: I93a77b7c42bb43c59dfb7748f9fdbd7aa55f39bb
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

2 files changed, 14 insertions, 0 deletions

diff --git a/src/quick/scenegraph/util/qsgplaintexture.cpp b/src/quick/scenegraph/util/qsgplaintexture.cpp
index 4c2b452b45..72313db836 100644
--- a/src/quick/scenegraph/util/qsgplaintexture.cpp
+++ b/src/quick/scenegraph/util/qsgplaintexture.cpp
@@ -378,6 +378,19 @@ void QSGPlainTexturePrivate::updateRhiTexture(QRhi *rhi, QRhiResourceUpdateBatch
         q->m_texture_size = tmp.size();
     }
 
+    if ((q->mipmapFiltering() != QSGTexture::None
+            || q->horizontalWrapMode() != QSGTexture::ClampToEdge
+            || q->verticalWrapMode() != QSGTexture::ClampToEdge)
+            && !rhi->isFeatureSupported(QRhi::NPOTTextureRepeat))
+    {
+        const int w = qNextPowerOfTwo(tmp.width() - 1);
+        const int h = qNextPowerOfTwo(tmp.height() - 1);
+        if (tmp.width() != w || tmp.height() != h) {
+            tmp = tmp.scaled(w, h, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+            q->m_texture_size = tmp.size();
+        }
+    }
+
     bool needsRebuild = q->m_texture && q->m_texture->pixelSize() != q->m_texture_size;
 
     if (mipmappingChanged) {
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp
index a154ae269a..df4e5cfde2 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial.cpp
+++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp
@@ -164,6 +164,7 @@ void QSGOpaqueTextureMaterialRhiShader::updateSampledImage(const RenderState &st
         if (isNpot) {
             t->setHorizontalWrapMode(QSGTexture::ClampToEdge);
             t->setVerticalWrapMode(QSGTexture::ClampToEdge);
+            t->setMipmapFiltering(QSGTexture::None);
         }
     }