summaryrefslogtreecommitdiffstats
path: root/TextureLoader/interface/TextureUtilities.h
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-04-01 18:32:52 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-04-01 18:32:52 +0000
commit3800d79e3d5491340e22cbf237ec4b62b75545a2 (patch)
tree25d6a8eb1a4efe07e7d2a6547e3655ce5f8b3f87 /TextureLoader/interface/TextureUtilities.h
parentMinor update (diff)
downloadDiligentTools-3800d79e3d5491340e22cbf237ec4b62b75545a2.tar.gz
DiligentTools-3800d79e3d5491340e22cbf237ec4b62b75545a2.zip
Some updates to texture loading routines.
Fixed https://github.com/DiligentGraphics/DiligentTools/issues/3
Diffstat (limited to 'TextureLoader/interface/TextureUtilities.h')
-rw-r--r--TextureLoader/interface/TextureUtilities.h21
1 files changed, 17 insertions, 4 deletions
diff --git a/TextureLoader/interface/TextureUtilities.h b/TextureLoader/interface/TextureUtilities.h
index ffd9e56..82fbf8d 100644
--- a/TextureLoader/interface/TextureUtilities.h
+++ b/TextureLoader/interface/TextureUtilities.h
@@ -34,13 +34,26 @@
namespace Diligent
{
-void CreateImageFromFile( const Diligent::Char *FilePath,
+/// Creates an image from file
+
+/// \param [in] FilePath - Source file path
+/// \param [out] ppImage - Memory location where pointer to the created image will be stored
+/// \param [out] ppDDSData - If the file is a dds file, this will contain the pointer to the blob
+/// containing dds data. This parameter can be null.
+void CreateImageFromFile( const Char *FilePath,
Image **ppImage,
IDataBlob **ppDDSData = nullptr);
-void CreateTextureFromFile( const Diligent::Char *FilePath,
+
+/// Creates a texture from file
+
+/// \param [in] FilePath - Source file path
+/// \param [in] TexLoadInfo - Texture loading information
+/// \param [in] pDevice - Render device that will be used to create the texture
+/// \param [out] ppTexture - Memory location where pointer to the created texture will be stored
+void CreateTextureFromFile( const Char *FilePath,
const TextureLoadInfo& TexLoadInfo,
- Diligent::IRenderDevice *pDevice,
- Diligent::ITexture **ppTexture );
+ IRenderDevice *pDevice,
+ ITexture **ppTexture );
}