From 5e3941de79b573b8798f6a6bcd4eaf544c48cde2 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Sun, 12 Nov 2017 19:18:57 -0800
Subject: Updated to version 2.1

---
 TextureLoader/interface/Image.h         | 7 +++++--
 TextureLoader/interface/TextureLoader.h | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'TextureLoader/interface')

diff --git a/TextureLoader/interface/Image.h b/TextureLoader/interface/Image.h
index eacf315..0f18835 100644
--- a/TextureLoader/interface/Image.h
+++ b/TextureLoader/interface/Image.h
@@ -62,10 +62,13 @@ namespace Diligent
         {}
     };
 
-    class Image : public Diligent::ObjectBase<Diligent::IObject, Diligent::IMemoryAllocator>
+    class Image : public ObjectBase<IObject>
     {
     public:
-        Image( Diligent::IFileStream *pSrcFile, 
+        typedef ObjectBase<IObject> TBase;
+
+        Image( IReferenceCounters *pRefCounters,
+               Diligent::IFileStream *pSrcFile, 
                const ImageLoadInfo& LoadInfo );
     
         const ImageDesc &GetDesc(){ return m_Desc; }
diff --git a/TextureLoader/interface/TextureLoader.h b/TextureLoader/interface/TextureLoader.h
index 341e1e8..c52da69 100644
--- a/TextureLoader/interface/TextureLoader.h
+++ b/TextureLoader/interface/TextureLoader.h
@@ -32,19 +32,23 @@ namespace Diligent
 {
     struct TextureLoadInfo
     {
+        const Diligent::Char *Name;
         Diligent::USAGE Usage;
         Diligent::Uint32 BindFlags;
         Diligent::Uint32 MipLevels;
         Diligent::Uint32 CPUAccessFlags;
         Diligent::Bool IsSRGB;
+        Diligent::Bool GenerateMips;
         Diligent::TEXTURE_FORMAT Format;
 
         TextureLoadInfo() :
+            Name(""),
             Usage( Diligent::USAGE_STATIC ),
             BindFlags( Diligent::BIND_SHADER_RESOURCE ),
             MipLevels(0),
             CPUAccessFlags(0),
             IsSRGB(false),
+            GenerateMips(true),
             Format(Diligent::TEX_FORMAT_UNKNOWN)
         {}
     };
-- 
cgit v1.2.3