From e7b12030bd0f8084432a7c38d6f48d57f0bc9684 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Tue, 2 Apr 2019 20:52:16 -0700 Subject: Added options to capture RGB vs RGBA when encoding image as png plus some format conversions --- TextureLoader/src/TextureLoader.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'TextureLoader/src/TextureLoader.cpp') 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(pDDSData->GetDataPtr()), -- cgit v1.2.3