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/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm
index e5af1cfab1..555ed5e79f 100644
--- a/src/gui/rhi/qrhimetal.mm
+++ b/src/gui/rhi/qrhimetal.mm
@@ -2499,11 +2499,40 @@ bool QMetalTexture::buildFrom(const QRhiNativeHandles *src)
     return true;
 }
 
+bool QMetalTexture::buildFrom(QRhiTexture::NativeTexture src)
+{
+    void * const * tex = (void * const *) src.object;
+    if (!tex || !*tex)
+        return false;
+
+    if (!prepareBuild())
+        return false;
+
+    d->tex = (id<MTLTexture>) *tex;
+
+    d->owns = false;
+    nativeHandlesStruct.texture = d->tex;
+
+    QRHI_PROF;
+    QRHI_PROF_F(newTexture(this, false, mipLevelCount, m_flags.testFlag(CubeMap) ? 6 : 1, samples));
+
+    lastActiveFrameSlot = -1;
+    generation += 1;
+    QRHI_RES_RHI(QRhiMetal);
+    rhiD->registerResource(this);
+    return true;
+}
+
 const QRhiNativeHandles *QMetalTexture::nativeHandles()
 {
     return &nativeHandlesStruct;
 }
 
+QRhiTexture::NativeTexture QMetalTexture::nativeTexture()
+{
+    return {&nativeHandlesStruct.texture, 0};
+}
+
 id<MTLTexture> QMetalTextureData::viewForLevel(int level)
 {
     Q_ASSERT(level >= 0 && level < int(q->mipLevelCount));