2 files changed, 9 insertions, 3 deletions
diff --git a/src/gui/rhi/qrhigles2.cpp b/src/gui/rhi/qrhigles2.cpp
index 62830c291d..f54371da66 100644
--- a/src/gui/rhi/qrhigles2.cpp
+++ b/src/gui/rhi/qrhigles2.cpp
@@ -1096,6 +1096,8 @@ bool QRhiGles2::create(QRhi::Flags flags)
         caps.glesMultiviewMultisampleRenderToTexture = false;
     }
 
+    caps.unpackRowLength = !caps.gles || caps.ctxMajor >= 3;
+
     nativeHandlesStruct.context = ctx;
 
     contextLost = false;
@@ -1426,7 +1428,7 @@ bool QRhiGles2::isFeatureSupported(QRhi::Feature feature) const
     case QRhi::PipelineCacheDataLoadSave:
         return caps.programBinary;
     case QRhi::ImageDataStride:
-        return !caps.gles || caps.ctxMajor >= 3;
+        return caps.unpackRowLength;
     case QRhi::RenderBufferImport:
         return true;
     case QRhi::ThreeDimensionalTextures:
@@ -2363,7 +2365,7 @@ void QRhiGles2::enqueueSubresUpload(QGles2Texture *texD, QGles2CommandBuffer *cb
             dataStride = bytesPerLine;
 
         cmd.args.subImage.rowStartAlign = (dataStride & 3) ? 1 : 4;
-        cmd.args.subImage.rowLength = bytesPerPixel ? dataStride / bytesPerPixel : 0;
+        cmd.args.subImage.rowLength = caps.unpackRowLength ? (bytesPerPixel ? dataStride / bytesPerPixel : 0) : 0;
 
         cmd.args.subImage.data = data;
     };
diff --git a/src/gui/rhi/qrhigles2_p.h b/src/gui/rhi/qrhigles2_p.h
index 4305186c02..4139579864 100644
--- a/src/gui/rhi/qrhigles2_p.h
+++ b/src/gui/rhi/qrhigles2_p.h
@@ -1014,7 +1014,10 @@ public:
               halfAttributes(false),
               multiView(false),
               timestamps(false),
-              objectLabel(false)
+              objectLabel(false),
+              glesMultisampleRenderToTexture(false),
+              glesMultiviewMultisampleRenderToTexture(false),
+              unpackRowLength(false)
         { }
         int ctxMajor;
         int ctxMinor;
@@ -1073,6 +1076,7 @@ public:
         uint objectLabel : 1;
         uint glesMultisampleRenderToTexture : 1;
         uint glesMultiviewMultisampleRenderToTexture : 1;
+        uint unpackRowLength : 1;
     } caps;
     QGles2SwapChain *currentSwapChain = nullptr;
     QSet<GLint> supportedCompressedFormats;