AuroraMiddleware/DirectXTex
1
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex synced 2024-11-09 22:40:06 +00:00
Code Issues Releases Wiki Activity

Added #ifdef around 'enum DDS_ALPHA_MODE' definition Allow DDSTextureLoader.h and DDSTextureLoader12.h to be included together. The same for 'enum WIC_LOADER_FLAGS'. (#153)

Browse Source
This commit is contained in:
Filip Strugar 2019-12-11 20:04:52 +00:00 committed by Chuck Walbourn
parent e5b520ea8e
commit 1f77e40045
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DDSTextureLoader/DDSTextureLoader.h
View File

@ -22,6 +22,8 @@
namespace DirectX
{
#ifndef DDS_ALPHA_MODE_DEFINED
#define DDS_ALPHA_MODE_DEFINED
enum DDS_ALPHA_MODE
{
DDS_ALPHA_MODE_UNKNOWN = 0,
@ -30,6 +32,7 @@ namespace DirectX
DDS_ALPHA_MODE_OPAQUE = 3,
DDS_ALPHA_MODE_CUSTOM = 4,
};
#endif
// Standard version
HRESULT CreateDDSTextureFromMemory(

3
DDSTextureLoader/DDSTextureLoader12.h
View File

@ -25,6 +25,8 @@
namespace DirectX
{
#ifndef DDS_ALPHA_MODE_DEFINED
#define DDS_ALPHA_MODE_DEFINED
enum DDS_ALPHA_MODE
{
DDS_ALPHA_MODE_UNKNOWN = 0,
@ -33,6 +35,7 @@ namespace DirectX
DDS_ALPHA_MODE_OPAQUE = 3,
DDS_ALPHA_MODE_CUSTOM = 4,
};
#endif
enum DDS_LOADER_FLAGS
{

3
WICTextureLoader/WICTextureLoader.h
View File

@ -29,12 +29,15 @@
namespace DirectX
{
#ifndef WIC_LOADER_FLAGS_DEFINED
#define WIC_LOADER_FLAGS_DEFINED
enum WIC_LOADER_FLAGS
{
WIC_LOADER_DEFAULT = 0,
WIC_LOADER_FORCE_SRGB = 0x1,
WIC_LOADER_IGNORE_SRGB = 0x2,
};
#endif
// Standard version
HRESULT CreateWICTextureFromMemory(

3
WICTextureLoader/WICTextureLoader12.h
View File

@ -27,6 +27,8 @@
namespace DirectX
{
#ifndef WIC_LOADER_FLAGS_DEFINED
#define WIC_LOADER_FLAGS_DEFINED
enum WIC_LOADER_FLAGS
{
WIC_LOADER_DEFAULT = 0,
@ -35,6 +37,7 @@ namespace DirectX
WIC_LOADER_MIP_AUTOGEN = 0x4,
WIC_LOADER_MIP_RESERVE = 0x8,
};
#endif
// Standard version
HRESULT __cdecl LoadWICTextureFromMemory(