diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-02-02 18:21:20 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-02-02 18:21:20 +0000 |
| commit | 9c21d003af3dc9654a9b302c3085253d55cab20e (patch) | |
| tree | dda706ba5f40f789c0afc3c7cbf8554dcae5ce1a /Source/Core/VideoCommon/Src/TextureDecoder.cpp | |
| parent | 9a975705bff532d3a81651145a08e056b0410f8d (diff) | |
Remove the global namespace a bit and remove some dead code.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7043 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src/TextureDecoder.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/TextureDecoder.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp index ad7b80503f..edfcc3bebc 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp @@ -181,14 +181,14 @@ int TexDecoder_GetPaletteSize(int format) } } -inline u32 decodeIA8(u16 val) +static inline u32 decodeIA8(u16 val) { int a = val >> 8; int i = val & 0xFF; return (a << 24) | (i << 16) | (i << 8) | i; } -inline u32 decode5A3(u16 val) +static inline u32 decode5A3(u16 val) { int r,g,b,a; if ((val & 0x8000)) @@ -208,7 +208,7 @@ inline u32 decode5A3(u16 val) return (a << 24) | (r << 16) | (g << 8) | b; } -inline u32 decode5A3RGBA(u16 val) +static inline u32 decode5A3RGBA(u16 val) { int r,g,b,a; if ((val&0x8000)) @@ -228,7 +228,7 @@ inline u32 decode5A3RGBA(u16 val) return r | (g<<8) | (b << 16) | (a << 24); } -inline u32 decode565RGBA(u16 val) +static inline u32 decode565RGBA(u16 val) { int r,g,b,a; r=Convert5To8((val>>11) & 0x1f); @@ -238,7 +238,7 @@ inline u32 decode565RGBA(u16 val) return r | (g<<8) | (b << 16) | (a << 24); } -inline u32 decodeIA8Swapped(u16 val) +static inline u32 decodeIA8Swapped(u16 val) { int a = val & 0xFF; int i = val >> 8; |