Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-04 04:16:12 +01:00
Code Issues Actions 11 Packages Projects 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
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
{