From e3dcba03f617e55a76fe7cb2540717945285d9ff Mon Sep 17 00:00:00 2001 From: Sergey Lipskiy Date: Fri, 5 Jun 2015 00:07:51 +0600 Subject: [PATCH] Minor correction in GetCI16RGBA functions. Make calculations a bit more optimal and clear. --- src/Textures.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Textures.cpp b/src/Textures.cpp index 390922fa..cb2a10c9 100644 --- a/src/Textures.cpp +++ b/src/Textures.cpp @@ -173,16 +173,14 @@ inline u32 GetCI16IA_RGBA4444(u64 *src, u16 x, u16 i, u8 palette) inline u32 GetCI16RGBA_RGBA8888(u64 *src, u16 x, u16 i, u8 palette) { - u16 tex = ((u16*)src)[x^i]; - tex = (tex >> 8) | ((tex & 0xff) << 8); - return RGBA5551_RGBA8888(((u16*)&TMEM[256])[((tex >> 6) & ~3)]); + const u16 tex = (((u16*)src)[x^i])&0xFF; + return RGBA5551_RGBA8888(((u16*)&TMEM[256])[tex << 2]); } inline u32 GetCI16RGBA_RGBA5551(u64 *src, u16 x, u16 i, u8 palette) { - u16 tex = ((u16*)src)[x^i]; - tex = (tex >> 8) | ((tex & 0xff) << 8); - return RGBA5551_RGBA5551(((u16*)&TMEM[256])[((tex >> 6) & ~3)]); + const u16 tex = (((u16*)src)[x^i]) & 0xFF; + return RGBA5551_RGBA5551(((u16*)&TMEM[256])[tex << 2]); } inline u32 GetRGBA5551_RGBA8888(u64 *src, u16 x, u16 i, u8 palette)