Skip to content

Commit 20a1dc6

Browse files
committed
Update DDS header
1 parent b2e73bb commit 20a1dc6

File tree

1 file changed

+19
-15
lines changed

1 file changed

+19
-15
lines changed

DirectXTex/DDS.h

+19-15
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,18 @@ namespace DirectX
3939
uint32_t ABitMask;
4040
};
4141

42-
#define DDS_FOURCC 0x00000004 // DDPF_FOURCC
43-
#define DDS_RGB 0x00000040 // DDPF_RGB
44-
#define DDS_RGBA 0x00000041 // DDPF_RGB | DDPF_ALPHAPIXELS
45-
#define DDS_LUMINANCE 0x00020000 // DDPF_LUMINANCE
46-
#define DDS_LUMINANCEA 0x00020001 // DDPF_LUMINANCE | DDPF_ALPHAPIXELS
47-
#define DDS_ALPHAPIXELS 0x00000001 // DDPF_ALPHAPIXELS
48-
#define DDS_ALPHA 0x00000002 // DDPF_ALPHA
49-
#define DDS_PAL8 0x00000020 // DDPF_PALETTEINDEXED8
50-
#define DDS_PAL8A 0x00000021 // DDPF_PALETTEINDEXED8 | DDPF_ALPHAPIXELS
51-
#define DDS_BUMPDUDV 0x00080000 // DDPF_BUMPDUDV
52-
// DDS_BUMPLUMINANCE 0x00040000
42+
#define DDS_FOURCC 0x00000004 // DDPF_FOURCC
43+
#define DDS_RGB 0x00000040 // DDPF_RGB
44+
#define DDS_RGBA 0x00000041 // DDPF_RGB | DDPF_ALPHAPIXELS
45+
#define DDS_LUMINANCE 0x00020000 // DDPF_LUMINANCE
46+
#define DDS_LUMINANCEA 0x00020001 // DDPF_LUMINANCE | DDPF_ALPHAPIXELS
47+
#define DDS_ALPHAPIXELS 0x00000001 // DDPF_ALPHAPIXELS
48+
#define DDS_ALPHA 0x00000002 // DDPF_ALPHA
49+
#define DDS_PAL8 0x00000020 // DDPF_PALETTEINDEXED8
50+
#define DDS_PAL8A 0x00000021 // DDPF_PALETTEINDEXED8 | DDPF_ALPHAPIXELS
51+
#define DDS_BUMPLUMINANCE 0x00040000 // DDPF_BUMPLUMINANCE
52+
#define DDS_BUMPDUDV 0x00080000 // DDPF_BUMPDUDV
53+
#define DDS_BUMPDUDVA 0x00080001 // DDPF_BUMPDUDV | DDPF_ALPHAPIXELS
5354

5455
#ifndef MAKEFOURCC
5556
#define MAKEFOURCC(ch0, ch1, ch2, ch3) \
@@ -187,10 +188,13 @@ namespace DirectX
187188
DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_A2B10G10R10 =
188189
{ sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000 };
189190

190-
// We do not support the following legacy Direct3D 9 formats:
191-
// DDSPF_A2W10V10U10 = { sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDV, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000 };
192-
// DDSPF_L6V5U5 = { sizeof(DDS_PIXELFORMAT), DDS_BUMPLUMINANCE, 0, 16, 0x001f, 0x03e0, 0xfc00, 0 };
193-
// DDSPF_X8L8V8U8 = { sizeof(DDS_PIXELFORMAT), DDS_BUMPLUMINANCE, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0 };
191+
// The following legacy Direct3D 9 formats use 'mixed' signed & unsigned channels so requires special handling
192+
DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_A2W10V10U10 =
193+
{ sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDVA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000 };
194+
DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_L6V5U5 =
195+
{ sizeof(DDS_PIXELFORMAT), DDS_BUMPLUMINANCE, 0, 16, 0x001f, 0x03e0, 0xfc00, 0 };
196+
DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_X8L8V8U8 =
197+
{ sizeof(DDS_PIXELFORMAT), DDS_BUMPLUMINANCE, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0 };
194198

195199
// This indicates the DDS_HEADER_DXT10 extension is present (the format is in dxgiFormat)
196200
DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_DX10 =

0 commit comments

Comments
 (0)