Texture Loader: added c++ version of CreateTextureLoaderFromDataBlob that takes data blob auto ptr

Author: TheMostDiligent

TextureLoader/interface/Image.h

@@ -130,9 +130,9 @@ struct Image : public ObjectBase<IObject>
                                    Image**              ppImage);
 
     /// Creates a new image from memory
-    static void CreateFromMemory(const ImageDesc& Desc,
-                                 IDataBlob*       pPixels,
-                                 Image**          ppImage);
+    static void CreateFromMemory(const ImageDesc&         Desc,
+                                 RefCntAutoPtr<IDataBlob> pPixels,
+                                 Image**                  ppImage);
 
     struct EncodeInfo
     {
@@ -179,9 +179,9 @@ struct Image : public ObjectBase<IObject>
           const IDataBlob*     pFileData,
           const ImageLoadInfo& LoadInfo);
 
-    Image(IReferenceCounters* pRefCounters,
-          const ImageDesc&    Desc,
-          IDataBlob*          pPixels);
+    Image(IReferenceCounters*      pRefCounters,
+          const ImageDesc&         Desc,
+          RefCntAutoPtr<IDataBlob> pPixels);
 
     void LoadTiffFile(const IDataBlob* pFileData, const ImageLoadInfo& LoadInfo);
 

TextureLoader/interface/TextureLoader.h

@@ -32,6 +32,10 @@
 #include "../../../DiligentCore/Graphics/GraphicsEngine/interface/Texture.h"
 #include "Image.h"
 
+#if DILIGENT_CPP_INTERFACE
+#    include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
+#endif
+
 DILIGENT_BEGIN_NAMESPACE(Diligent)
 
 struct Image;
@@ -271,6 +275,12 @@ void DILIGENT_GLOBAL_FUNCTION(CreateTextureLoaderFromDataBlob)(IDataBlob*
                                                                const TextureLoadInfo REF TexLoadInfo,
                                                                ITextureLoader**          ppLoader);
 
+#if DILIGENT_CPP_INTERFACE
+void CreateTextureLoaderFromDataBlob(RefCntAutoPtr<IDataBlob> pDataBlob,
+                                     const TextureLoadInfo&   TexLoadInfo,
+                                     ITextureLoader**         ppLoader);
+#endif
+
 /// Writes texture data as DDS file.
 
 /// \param [in]  FilePath - DDS file path.

TextureLoader/src/Image.cpp

@@ -406,20 +406,20 @@ void Image::CreateFromDataBlob(const IDataBlob*     pFileData,
     (*ppImage)->AddRef();
 }
 
-Image::Image(IReferenceCounters* pRefCounters,
-             const ImageDesc&    Desc,
-             IDataBlob*          pPixels) :
+Image::Image(IReferenceCounters*      pRefCounters,
+             const ImageDesc&         Desc,
+             RefCntAutoPtr<IDataBlob> pPixels) :
     TBase{pRefCounters},
     m_Desc{Desc},
-    m_pData{pPixels}
+    m_pData{std::move(pPixels)}
 {
 }
 
-void Image::CreateFromMemory(const ImageDesc& Desc,
-                             IDataBlob*       pPixels,
-                             Image**          ppImage)
+void Image::CreateFromMemory(const ImageDesc&         Desc,
+                             RefCntAutoPtr<IDataBlob> pPixels,
+                             Image**                  ppImage)
 {
-    *ppImage = MakeNewRCObj<Image>()(Desc, pPixels);
+    *ppImage = MakeNewRCObj<Image>()(Desc, std::move(pPixels));
     (*ppImage)->AddRef();
 }
 

TextureLoader/src/TextureLoaderImpl.cpp

@@ -525,13 +525,16 @@ void CreateTextureLoaderFromMemory(const void*            pData,
     }
 }
 
-void CreateTextureLoaderFromDataBlob(IDataBlob*             pDataBlob,
-                                     const TextureLoadInfo& TexLoadInfo,
-                                     ITextureLoader**       ppLoader)
+void CreateTextureLoaderFromDataBlob(RefCntAutoPtr<IDataBlob> pDataBlob,
+                                     const TextureLoadInfo&   TexLoadInfo,
+                                     ITextureLoader**         ppLoader)
 {
     try
     {
-        RefCntAutoPtr<ITextureLoader> pTexLoader{MakeNewRCObj<TextureLoaderImpl>()(TexLoadInfo, pDataBlob->GetConstDataPtr<Uint8>(), pDataBlob->GetSize(), RefCntAutoPtr<IDataBlob>{pDataBlob})};
+        const Uint8* pData = pDataBlob->GetConstDataPtr<Uint8>();
+        const size_t Size  = pDataBlob->GetSize();
+
+        RefCntAutoPtr<ITextureLoader> pTexLoader{MakeNewRCObj<TextureLoaderImpl>()(TexLoadInfo, pData, Size, std::move(pDataBlob))};
         if (pTexLoader)
             pTexLoader->QueryInterface(IID_TextureLoader, reinterpret_cast<IObject**>(ppLoader));
     }
@@ -541,6 +544,13 @@ void CreateTextureLoaderFromDataBlob(IDataBlob*             pDataBlob,
     }
 }
 
+void CreateTextureLoaderFromDataBlob(IDataBlob*             pDataBlob,
+                                     const TextureLoadInfo& TexLoadInfo,
+                                     ITextureLoader**       ppLoader)
+{
+    CreateTextureLoaderFromDataBlob(RefCntAutoPtr<IDataBlob>{pDataBlob, IID_DataBlob}, TexLoadInfo, ppLoader);
+}
+
 void CreateTextureLoaderFromImage(Image*                 pSrcImage,
                                   const TextureLoadInfo& TexLoadInfo,
                                   ITextureLoader**       ppLoader)