summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/TextureDecoder_Generic.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2014-03-17 20:19:11 -0500
committerRyan Houdek <Sonicadvance1@gmail.com>2014-03-17 20:19:11 -0500
commit027240da45ce3ae5cb0c208c7f4adf48ef489fa5 (patch)
tree2f61ed927eebfbda01ebdaa39b904a37d28a31ff /Source/Core/VideoCommon/TextureDecoder_Generic.cpp
parent8f0fa997cb4d704b531feba8b39f89f83f6faa0d (diff)
parent484fb46390bcdffcf9509f8d6c784f5b7bce0167 (diff)
Merge pull request #188 from Sonicadvance1/clang-warnings
Fixes warnings that Clang 3.4 exposes on Android.
Diffstat (limited to 'Source/Core/VideoCommon/TextureDecoder_Generic.cpp')
-rw-r--r--Source/Core/VideoCommon/TextureDecoder_Generic.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp
index b7141b7778..95ead9c174 100644
--- a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp
+++ b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp
@@ -170,13 +170,6 @@ int TexDecoder_GetPaletteSize(int format)
}
}
-static inline u32 decodeIA8(u16 val)
-{
- int a = val >> 8;
- int i = val & 0xFF;
- return (a << 24) | (i << 16) | (i << 8) | i;
-}
-
static inline u32 decode5A3(u16 val)
{
int r,g,b,a;