From 824a0a19f108704d8ba6237f1799c4136c3f1d42 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 2 Sep 2014 00:52:13 -0400 Subject: [PATCH] Common: Make the LUTs in ColorUtil static --- Source/Core/Common/ColorUtil.cpp | 36 +++++++++++++++++++------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/Source/Core/Common/ColorUtil.cpp b/Source/Core/Common/ColorUtil.cpp index f0ff3b32b5..990d8e075c 100644 --- a/Source/Core/Common/ColorUtil.cpp +++ b/Source/Core/Common/ColorUtil.cpp @@ -8,13 +8,21 @@ namespace ColorUtil { -const int lut5to8[] = { 0x00,0x08,0x10,0x18,0x20,0x29,0x31,0x39, - 0x41,0x4A,0x52,0x5A,0x62,0x6A,0x73,0x7B, - 0x83,0x8B,0x94,0x9C,0xA4,0xAC,0xB4,0xBD, - 0xC5,0xCD,0xD5,0xDE,0xE6,0xEE,0xF6,0xFF }; -const int lut4to8[] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77, - 0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF }; -const int lut3to8[] = { 0x00,0x24,0x48,0x6D,0x91,0xB6,0xDA,0xFF }; +static const int s_lut5to8[] = { + 0x00,0x08,0x10,0x18,0x20,0x29,0x31,0x39, + 0x41,0x4A,0x52,0x5A,0x62,0x6A,0x73,0x7B, + 0x83,0x8B,0x94,0x9C,0xA4,0xAC,0xB4,0xBD, + 0xC5,0xCD,0xD5,0xDE,0xE6,0xEE,0xF6,0xFF +}; + +static const int s_lut4to8[] = { + 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77, + 0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF +}; + +static const int s_lut3to8[] = { + 0x00,0x24,0x48,0x6D,0x91,0xB6,0xDA,0xFF +}; static u32 Decode5A3(u16 val) { @@ -24,17 +32,17 @@ static u32 Decode5A3(u16 val) if (val & 0x8000) { - r = lut5to8[(val >> 10) & 0x1f]; - g = lut5to8[(val >> 5) & 0x1f]; - b = lut5to8[(val) & 0x1f]; + r = s_lut5to8[(val >> 10) & 0x1f]; + g = s_lut5to8[(val >> 5) & 0x1f]; + b = s_lut5to8[(val) & 0x1f]; a = 0xFF; } else { - a = lut3to8[(val >> 12) & 0x7]; - r = (lut4to8[(val >> 8) & 0xf] * a + (bg_color & 0xFF) * (255 - a)) / 255; - g = (lut4to8[(val >> 4) & 0xf] * a + ((bg_color >> 8) & 0xFF) * (255 - a)) / 255; - b = (lut4to8[(val) & 0xf] * a + ((bg_color >> 16) & 0xFF) * (255 - a)) / 255; + a = s_lut3to8[(val >> 12) & 0x7]; + r = (s_lut4to8[(val >> 8) & 0xf] * a + (bg_color & 0xFF) * (255 - a)) / 255; + g = (s_lut4to8[(val >> 4) & 0xf] * a + ((bg_color >> 8) & 0xFF) * (255 - a)) / 255; + b = (s_lut4to8[(val) & 0xf] * a + ((bg_color >> 16) & 0xFF) * (255 - a)) / 255; a = 0xFF; } return (a << 24) | (r << 16) | (g << 8) | b;