diff options
| author | hthh <hthh@hh.ht> | 2017-01-14 11:29:05 +1100 |
|---|---|---|
| committer | hthh <hthh@hh.ht> | 2017-01-15 20:23:26 +1100 |
| commit | 88d52b4d69a4ca4e81c7ac32d2df0c0f826fcc19 (patch) | |
| tree | 032115824c50ead073a0d8fe928b051f5996b29e /Source/Core/VideoCommon/TextureDecoder_Common.cpp | |
| parent | 5d4e4aa561dc7de12cd54f35a98adcccd85bb5d3 (diff) | |
TextureDecoder: Deduplicate some utility code
Diffstat (limited to 'Source/Core/VideoCommon/TextureDecoder_Common.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/TextureDecoder_Common.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
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) { |