summaryrefslogtreecommitdiffstats
path: root/TextureLoader/src/TextureLoader.cpp
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-04-03 03:52:16 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-04-03 03:52:16 +0000
commite7b12030bd0f8084432a7c38d6f48d57f0bc9684 (patch)
tree765043aeff0fe359566abb2384f86ce46935ac7e /TextureLoader/src/TextureLoader.cpp
parentImplemented encoding image as jpeg (diff)
downloadDiligentTools-e7b12030bd0f8084432a7c38d6f48d57f0bc9684.tar.gz
DiligentTools-e7b12030bd0f8084432a7c38d6f48d57f0bc9684.zip
Added options to capture RGB vs RGBA when encoding image as png plus some format conversions
Diffstat (limited to 'TextureLoader/src/TextureLoader.cpp')
-rw-r--r--TextureLoader/src/TextureLoader.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/TextureLoader/src/TextureLoader.cpp b/TextureLoader/src/TextureLoader.cpp
index 0b6529c..045df1b 100644
--- a/TextureLoader/src/TextureLoader.cpp
+++ b/TextureLoader/src/TextureLoader.cpp
@@ -31,8 +31,6 @@
#include "GraphicsAccessories.h"
#include "DDSLoader.h"
-using namespace Diligent;
-
namespace Diligent
{
static const float a = 0.055f;
@@ -121,10 +119,10 @@ namespace Diligent
}
}
- void CreateTextureFromImage( Image *pSrcImage,
+ void CreateTextureFromImage( Image* pSrcImage,
const TextureLoadInfo& TexLoadInfo,
- Diligent::IRenderDevice *pDevice,
- Diligent::ITexture **ppTexture )
+ IRenderDevice* pDevice,
+ ITexture** ppTexture )
{
const auto& ImgDesc = pSrcImage->GetDesc();
TextureDesc TexDesc;
@@ -244,8 +242,8 @@ namespace Diligent
void CreateTextureFromDDS( IDataBlob *pDDSData,
const TextureLoadInfo& TexLoadInfo,
- Diligent::IRenderDevice *pDevice,
- Diligent::ITexture **ppTexture )
+ IRenderDevice *pDevice,
+ ITexture **ppTexture )
{
CreateDDSTextureFromMemoryEx(pDevice,
reinterpret_cast<const Uint8*>(pDDSData->GetDataPtr()),