RHI: Remove old native texture API

Task-number: QTBUG-78570
Change-Id: I8c4850828ac03319ac923a26c2e985883956c286
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

1 files changed, 1 insertions, 42 deletions

diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp
index ba2488bffb..c5923fe411 100644
--- a/src/gui/rhi/qrhid3d11.cpp
+++ b/src/gui/rhi/qrhid3d11.cpp
@@ -108,17 +108,6 @@ QT_BEGIN_NAMESPACE
     \c{ID3D11Device *} and \c{ID3D11DeviceContext *}.
  */
 
-/*!
-    \class QRhiD3D11TextureNativeHandles
-    \internal
-    \inmodule QtGui
-    \brief Holds the D3D texture object that is backing a QRhiTexture instance.
-
-    \note The class uses \c{void *} as the type since including the COM-based
-    \c{d3d11.h} headers is not acceptable here. The actual type is
-    \c{ID3D11Texture2D *}.
- */
-
 // help mingw with its ancient sdk headers
 #ifndef DXGI_ADAPTER_FLAG_SOFTWARE
 #define DXGI_ADAPTER_FLAG_SOFTWARE 2
@@ -2674,8 +2663,6 @@ bool QD3D11Texture::finishBuild()
         return false;
     }
 
-    nativeHandlesStruct.texture = tex;
-
     generation += 1;
     return true;
 }
@@ -2741,29 +2728,6 @@ bool QD3D11Texture::build()
     return true;
 }
 
-bool QD3D11Texture::buildFrom(const QRhiNativeHandles *src)
-{
-    const QRhiD3D11TextureNativeHandles *h = static_cast<const QRhiD3D11TextureNativeHandles *>(src);
-    if (!h || !h->texture)
-        return false;
-
-    if (!prepareBuild())
-        return false;
-
-    tex = static_cast<ID3D11Texture2D *>(h->texture);
-
-    if (!finishBuild())
-        return false;
-
-    QRHI_PROF;
-    QRHI_PROF_F(newTexture(this, false, int(mipLevelCount), m_flags.testFlag(CubeMap) ? 6 : 1, int(sampleDesc.Count)));
-
-    owns = false;
-    QRHI_RES_RHI(QRhiD3D11);
-    rhiD->registerResource(this);
-    return true;
-}
-
 bool QD3D11Texture::buildFrom(QRhiTexture::NativeTexture src)
 {
     auto *srcTex = static_cast<ID3D11Texture2D * const *>(src.object);
@@ -2787,14 +2751,9 @@ bool QD3D11Texture::buildFrom(QRhiTexture::NativeTexture src)
     return true;
 }
 
-const QRhiNativeHandles *QD3D11Texture::nativeHandles()
-{
-    return &nativeHandlesStruct;
-}
-
 QRhiTexture::NativeTexture QD3D11Texture::nativeTexture()
 {
-    return {&nativeHandlesStruct.texture, 0};
+    return {&tex, 0};
 }
 
 ID3D11UnorderedAccessView *QD3D11Texture::unorderedAccessViewForLevel(int level)