From 88d52b4d69a4ca4e81c7ac32d2df0c0f826fcc19 Mon Sep 17 00:00:00 2001 From: hthh Date: Sat, 14 Jan 2017 11:29:05 +1100 Subject: TextureDecoder: Deduplicate some utility code --- Source/Core/VideoCommon/TextureDecoder_Common.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'Source/Core/VideoCommon/TextureDecoder_Common.cpp') diff --git a/Source/Core/VideoCommon/TextureDecoder_Common.cpp b/Source/Core/VideoCommon/TextureDecoder_Common.cpp index af1d5e9148..7f151b2406 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Common.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Common.cpp @@ -10,6 +10,7 @@ #include "Common/MsgHandler.h" #include "VideoCommon/LookUpTables.h" #include "VideoCommon/TextureDecoder.h" +#include "VideoCommon/TextureDecoder_Util.h" #include "VideoCommon/sfont.inc" static bool TexFmt_Overlay_Enable = false; @@ -422,18 +423,6 @@ static inline u32 DecodePixel_Paletted(u16 pixel, TlutFormat tlutfmt) } } -struct DXTBlock -{ - u16 color1; - u16 color2; - u8 lines[4]; -}; - -static inline u32 MakeRGBA(int r, int g, int b, int a) -{ - return (a << 24) | (b << 16) | (g << 8) | r; -} - void TexDecoder_DecodeTexel(u8* dst, const u8* src, int s, int t, int imageWidth, int texformat, const u8* tlut_, TlutFormat tlutfmt) { -- cgit v1.2.3