diff options
| author | death2droid <death2droid@gmail.com> | 2009-05-09 07:55:30 +0000 |
|---|---|---|
| committer | death2droid <death2droid@gmail.com> | 2009-05-09 07:55:30 +0000 |
| commit | be45b223bb9a43b4f249cf4dcedbc6af50e384b9 (patch) | |
| tree | 38f6fef1aff31d99316d53a4d9f1588051eb901c /Source/Core/VideoCommon/Src/TextureDecoder.h | |
| parent | 8e535bf2c0085c02d59e5717ba0f6492bad77ab4 (diff) | |
A fix by baby.lueshi that fixes the problems with rev 3187
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3190 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src/TextureDecoder.h')
| -rw-r--r-- | Source/Core/VideoCommon/Src/TextureDecoder.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.h b/Source/Core/VideoCommon/Src/TextureDecoder.h index 5d2f9aeb1b..9acd3ebc22 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.h +++ b/Source/Core/VideoCommon/Src/TextureDecoder.h @@ -18,7 +18,7 @@ #ifndef _TEXTUREDECODER_H #define _TEXTUREDECODER_H -enum +enum { TMEM_SIZE = 1024*1024, HALFTMEM_SIZE = 512*1024 @@ -67,18 +67,19 @@ enum TextureFormat int TexDecoder_GetTexelSizeInNibbles(int format); int TexDecoder_GetTextureSizeInBytes(int width, int height, int format); int TexDecoder_GetBlockWidthInTexels(int format); +int TexDecoder_GetBlockHeightInTexels(int format); int TexDecoder_GetPaletteSize(int fmt); enum PC_TexFormat { - PC_TEX_FMT_NONE = 0, - PC_TEX_FMT_BGRA32, - PC_TEX_FMT_RGBA32, - PC_TEX_FMT_IA4, - PC_TEX_FMT_I8, - PC_TEX_FMT_IA8, - PC_TEX_FMT_RGB565, - PC_TEX_FMT_DXT1, + PC_TEX_FMT_NONE = 0, + PC_TEX_FMT_BGRA32, + PC_TEX_FMT_RGBA32, + PC_TEX_FMT_IA4, + PC_TEX_FMT_I8, + PC_TEX_FMT_IA8, + PC_TEX_FMT_RGB565, + PC_TEX_FMT_DXT1, }; PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt); @@ -89,4 +90,3 @@ u32 TexDecoder_GetTlutHash(const u8* src, int len); void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center); #endif - |