diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2016-08-20 06:38:41 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2016-08-20 06:38:41 +0000 |
| commit | 8077ddaf62bdbff2169973eca565a5752501587d (patch) | |
| tree | 0532180e74cf5215736fd4e053216e291326fbcb /TextureLoader/interface | |
| parent | One more update to android build configuration (diff) | |
| download | DiligentTools-8077ddaf62bdbff2169973eca565a5752501587d.tar.gz DiligentTools-8077ddaf62bdbff2169973eca565a5752501587d.zip | |
Updated to Diligent Engine 2.0
Diffstat (limited to 'TextureLoader/interface')
| -rw-r--r-- | TextureLoader/interface/Image.h | 4 | ||||
| -rw-r--r-- | TextureLoader/interface/TextureLoader.h | 4 | ||||
| -rw-r--r-- | TextureLoader/interface/TextureUtilities.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/TextureLoader/interface/Image.h b/TextureLoader/interface/Image.h index 74917e6..ae41a0e 100644 --- a/TextureLoader/interface/Image.h +++ b/TextureLoader/interface/Image.h @@ -1,4 +1,4 @@ -/* Copyright 2015 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,7 +62,7 @@ namespace Diligent {} }; - class Image : public Diligent::ObjectBase<Diligent::IObject> + class Image : public Diligent::ObjectBase<Diligent::IObject, Diligent::IMemoryAllocator> { public: Image( Diligent::IFileStream *pSrcFile, diff --git a/TextureLoader/interface/TextureLoader.h b/TextureLoader/interface/TextureLoader.h index d46582e..3b9769c 100644 --- a/TextureLoader/interface/TextureLoader.h +++ b/TextureLoader/interface/TextureLoader.h @@ -1,4 +1,4 @@ -/* Copyright 2015 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ namespace Diligent BindFlags( Diligent::BIND_SHADER_RESOURCE ), MipLevels(0), CPUAccessFlags(0), - IsSRGB(true), + IsSRGB(false), Format(Diligent::TEX_FORMAT_UNKNOWN) {} }; diff --git a/TextureLoader/interface/TextureUtilities.h b/TextureLoader/interface/TextureUtilities.h index e68ac40..69c125a 100644 --- a/TextureLoader/interface/TextureUtilities.h +++ b/TextureLoader/interface/TextureUtilities.h @@ -1,4 +1,4 @@ -/* Copyright 2015 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. |