Commit eaf15bba authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'ea4d46e7'

* commit 'ea4d46e7':
  dds: Fix enum declaration
Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 6b9be608 ea4d46e7
...@@ -54,7 +54,7 @@ enum DDSPostProc { ...@@ -54,7 +54,7 @@ enum DDSPostProc {
DDS_SWIZZLE_XGBR, DDS_SWIZZLE_XGBR,
DDS_SWIZZLE_XRBG, DDS_SWIZZLE_XRBG,
DDS_SWIZZLE_XGXR, DDS_SWIZZLE_XGXR,
} DDSPostProc; };
enum DDSDXGIFormat { enum DDSDXGIFormat {
DXGI_FORMAT_R16G16B16A16_TYPELESS = 9, DXGI_FORMAT_R16G16B16A16_TYPELESS = 9,
...@@ -93,7 +93,7 @@ enum DDSDXGIFormat { ...@@ -93,7 +93,7 @@ enum DDSDXGIFormat {
DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91, DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91,
DXGI_FORMAT_B8G8R8X8_TYPELESS = 92, DXGI_FORMAT_B8G8R8X8_TYPELESS = 92,
DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93, DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93,
} DDSDXGIFormat; };
typedef struct DDSContext { typedef struct DDSContext {
TextureDSPContext texdsp; TextureDSPContext texdsp;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment