diff options
Diffstat (limited to 'Samples/CommonSrc/Render/Render_LoadTextureDDS.cpp')
| -rw-r--r-- | Samples/CommonSrc/Render/Render_LoadTextureDDS.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/Samples/CommonSrc/Render/Render_LoadTextureDDS.cpp b/Samples/CommonSrc/Render/Render_LoadTextureDDS.cpp index cf20cdd..3da1441 100644 --- a/Samples/CommonSrc/Render/Render_LoadTextureDDS.cpp +++ b/Samples/CommonSrc/Render/Render_LoadTextureDDS.cpp @@ -28,45 +28,45 @@ limitations under the License. namespace OVR { namespace Render { -static const UPInt OVR_DDS_PF_FOURCC = 0x4; -static const UInt32 OVR_DXT1_MAGIC_NUMBER = 0x31545844; // "DXT1" -static const UInt32 OVR_DXT2_MAGIC_NUMBER = 0x32545844; // "DXT2" -static const UInt32 OVR_DXT3_MAGIC_NUMBER = 0x33545844; // "DXT3" -static const UInt32 OVR_DXT4_MAGIC_NUMBER = 0x34545844; // "DXT4" -static const UInt32 OVR_DXT5_MAGIC_NUMBER = 0x35545844; // "DXT5" +static const size_t OVR_DDS_PF_FOURCC = 0x4; +static const uint32_t OVR_DXT1_MAGIC_NUMBER = 0x31545844; // "DXT1" +static const uint32_t OVR_DXT2_MAGIC_NUMBER = 0x32545844; // "DXT2" +static const uint32_t OVR_DXT3_MAGIC_NUMBER = 0x33545844; // "DXT3" +static const uint32_t OVR_DXT4_MAGIC_NUMBER = 0x34545844; // "DXT4" +static const uint32_t OVR_DXT5_MAGIC_NUMBER = 0x35545844; // "DXT5" struct OVR_DDS_PIXELFORMAT { - UInt32 Size; - UInt32 Flags; - UInt32 FourCC; - UInt32 RGBBitCount; - UInt32 RBitMask; - UInt32 GBitMask; - UInt32 BBitMask; - UInt32 ABitMask; + uint32_t Size; + uint32_t Flags; + uint32_t FourCC; + uint32_t RGBBitCount; + uint32_t RBitMask; + uint32_t GBitMask; + uint32_t BBitMask; + uint32_t ABitMask; }; struct OVR_DDS_HEADER { - UInt32 Size; - UInt32 Flags; - UInt32 Height; - UInt32 Width; - UInt32 PitchOrLinearSize; - UInt32 Depth; - UInt32 MipMapCount; - UInt32 Reserved1[11]; - OVR_DDS_PIXELFORMAT PixelFormat; - UInt32 Caps; - UInt32 Caps2; - UInt32 Caps3; - UInt32 Caps4; - UInt32 Reserved2; + uint32_t Size; + uint32_t Flags; + uint32_t Height; + uint32_t Width; + uint32_t PitchOrLinearSize; + uint32_t Depth; + uint32_t MipMapCount; + uint32_t Reserved1[11]; + OVR_DDS_PIXELFORMAT PixelFormat; + uint32_t Caps; + uint32_t Caps2; + uint32_t Caps3; + uint32_t Caps4; + uint32_t Reserved2; }; // Returns -1 on failure, or a valid TextureFormat value on success -static inline int InterpretPixelFormatFourCC(UInt32 fourCC) { +static inline int InterpretPixelFormatFourCC(uint32_t fourCC) { switch (fourCC) { case OVR_DXT1_MAGIC_NUMBER: return Texture_DXT1; case OVR_DXT2_MAGIC_NUMBER: return Texture_DXT3; @@ -97,7 +97,7 @@ Texture* LoadTextureDDS(RenderDevice* ren, File* f) int format = Texture_RGBA; - UInt32 mipCount = header.MipMapCount; + uint32_t mipCount = header.MipMapCount; if(mipCount <= 0) { mipCount = 1; |