Image: added option to use custom memory allocator

TheMostDiligent · TheMostDiligent · commit 598fc8a17436 · 2024-11-04T20:06:33.000-08:00
diff --git a/TextureLoader/interface/Image.h b/TextureLoader/interface/Image.h
@@ -84,6 +84,9 @@ struct ImageLoadInfo
     ///
     /// \note This flag is only used if PermultiplyAlpha is true.
     bool IsSRGB DEFAULT_INITIALIZER(false);
+
+    /// Memory allocator
+    struct IMemoryAllocator* pAllocator DEFAULT_INITIALIZER(nullptr);
 };
 typedef struct ImageLoadInfo ImageLoadInfo;
 
@@ -133,15 +136,16 @@ struct Image : public ObjectBase<IObject>
 
     struct EncodeInfo
     {
-        Uint32            Width       = 0;
-        Uint32            Height      = 0;
-        TEXTURE_FORMAT    TexFormat   = TEX_FORMAT_UNKNOWN;
-        bool              KeepAlpha   = false;
-        bool              FlipY       = false;
-        const void*       pData       = nullptr;
-        Uint32            Stride      = 0;
-        IMAGE_FILE_FORMAT FileFormat  = IMAGE_FILE_FORMAT_JPEG;
-        int               JpegQuality = 95;
+        Uint32                   Width       = 0;
+        Uint32                   Height      = 0;
+        TEXTURE_FORMAT           TexFormat   = TEX_FORMAT_UNKNOWN;
+        bool                     KeepAlpha   = false;
+        bool                     FlipY       = false;
+        const void*              pData       = nullptr;
+        Uint32                   Stride      = 0;
+        IMAGE_FILE_FORMAT        FileFormat  = IMAGE_FILE_FORMAT_JPEG;
+        int                      JpegQuality = 95;
+        struct IMemoryAllocator* pAllocator  = nullptr;
     };
     static void Encode(const EncodeInfo& Info, IDataBlob** ppEncodedData);
 
diff --git a/TextureLoader/src/Image.cpp b/TextureLoader/src/Image.cpp
@@ -331,7 +331,7 @@ Image::Image(IReferenceCounters*  pRefCounters,
              IDataBlob*           pFileData,
              const ImageLoadInfo& LoadInfo) :
     TBase{pRefCounters},
-    m_pData{DataBlobImpl::Create()}
+    m_pData{DataBlobImpl::Create(LoadInfo.pAllocator)}
 {
     if (LoadInfo.Format == IMAGE_FILE_FORMAT_TIFF)
     {
@@ -476,7 +476,7 @@ std::vector<Uint8> Image::ConvertImageData(Uint32         Width,
 
 void Image::Encode(const EncodeInfo& Info, IDataBlob** ppEncodedData)
 {
-    auto pEncodedData = DataBlobImpl::Create();
+    auto pEncodedData = DataBlobImpl::Create(Info.pAllocator);
     if (Info.FileFormat == IMAGE_FILE_FORMAT_JPEG)
     {
         auto RGBData = ConvertImageData(Info.Width, Info.Height, reinterpret_cast<const Uint8*>(Info.pData), Info.Stride, Info.TexFormat, TEX_FORMAT_RGBA8_UNORM, false, Info.FlipY);
diff --git a/TextureLoader/src/TextureLoaderImpl.cpp b/TextureLoader/src/TextureLoaderImpl.cpp
@@ -155,6 +155,7 @@ TextureLoaderImpl::TextureLoaderImpl(IReferenceCounters*        pRefCounters,
         }
         ImgLoadInfo.IsSRGB           = TexLoadInfo.IsSRGB;
         ImgLoadInfo.PermultiplyAlpha = TexLoadInfo.PermultiplyAlpha;
+        ImgLoadInfo.pAllocator       = TexLoadInfo.pAllocator;
         RefCntAutoPtr<Image> pImage;
         Image::CreateFromDataBlob(m_pDataBlob, ImgLoadInfo, &pImage);
         LoadFromImage(pImage, TexLoadInfo);

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ Image::Image(IReferenceCounters* pRefCounters,`
`331`	`331`	`IDataBlob* pFileData,`
`332`	`332`	`const ImageLoadInfo& LoadInfo) :`
`333`	`333`	`TBase{pRefCounters},`
`334`		`- m_pData{DataBlobImpl::Create()}`
	`334`	`+ m_pData{DataBlobImpl::Create(LoadInfo.pAllocator)}`
`335`	`335`	`{`
`336`	`336`	`if (LoadInfo.Format == IMAGE_FILE_FORMAT_TIFF)`
`337`	`337`	`{`
`@@ -476,7 +476,7 @@ std::vector<Uint8> Image::ConvertImageData(Uint32 Width,`
`476`	`476`
`477`	`477`	`void Image::Encode(const EncodeInfo& Info, IDataBlob** ppEncodedData)`
`478`	`478`	`{`
`479`		`- auto pEncodedData = DataBlobImpl::Create();`
	`479`	`+ auto pEncodedData = DataBlobImpl::Create(Info.pAllocator);`
`480`	`480`	`if (Info.FileFormat == IMAGE_FILE_FORMAT_JPEG)`
`481`	`481`	`{`
`482`	`482`	`auto RGBData = ConvertImageData(Info.Width, Info.Height, reinterpret_cast<const Uint8*>(Info.pData), Info.Stride, Info.TexFormat, TEX_FORMAT_RGBA8_UNORM, false, Info.FlipY);`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ TextureLoaderImpl::TextureLoaderImpl(IReferenceCounters* pRefCounters,`
`155`	`155`	`}`
`156`	`156`	`ImgLoadInfo.IsSRGB = TexLoadInfo.IsSRGB;`
`157`	`157`	`ImgLoadInfo.PermultiplyAlpha = TexLoadInfo.PermultiplyAlpha;`
	`158`	`+ ImgLoadInfo.pAllocator = TexLoadInfo.pAllocator;`
`158`	`159`	`RefCntAutoPtr<Image> pImage;`
`159`	`160`	`Image::CreateFromDataBlob(m_pDataBlob, ImgLoadInfo, &pImage);`
`160`	`161`	`LoadFromImage(pImage, TexLoadInfo);`