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

Change-Id: Ia24cc8b86def0d9d9c17d6775cc519e491b860b1

1 files changed, 29 insertions, 0 deletions

diff --git a/src/gui/rhi/qrhigles2.cpp b/src/gui/rhi/qrhigles2.cpp
index b551980bb3..563d59b318 100644
--- a/src/gui/rhi/qrhigles2.cpp
+++ b/src/gui/rhi/qrhigles2.cpp
@@ -3404,11 +3404,40 @@ bool QGles2Texture::buildFrom(const QRhiNativeHandles *src)
     return true;
 }
 
+bool QGles2Texture::buildFrom(QRhiTexture::NativeTexture src)
+{
+    const uint *textureId = static_cast<const uint *>(src.object);
+    if (!textureId || !*textureId)
+        return false;
+
+    if (!prepareBuild())
+        return false;
+
+    texture = *textureId;
+    specified = true;
+
+    QRHI_RES_RHI(QRhiGles2);
+    QRHI_PROF;
+    QRHI_PROF_F(newTexture(this, false, mipLevelCount, m_flags.testFlag(CubeMap) ? 6 : 1, 1));
+
+    owns = false;
+    nativeHandlesStruct.texture = texture;
+
+    generation += 1;
+    rhiD->registerResource(this);
+    return true;
+}
+
 const QRhiNativeHandles *QGles2Texture::nativeHandles()
 {
     return &nativeHandlesStruct;
 }
 
+QRhiTexture::NativeTexture QGles2Texture::nativeTexture()
+{
+    return {&nativeHandlesStruct.texture, 0};
+}
+
 QGles2Sampler::QGles2Sampler(QRhiImplementation *rhi, Filter magFilter, Filter minFilter, Filter mipmapMode,
                              AddressMode u, AddressMode v)
     : QRhiSampler(rhi, magFilter, minFilter, mipmapMode, u, v)