diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp index 4de792df20..cfa35c48a6 100644 --- a/Source/Core/Core/GeckoCode.cpp +++ b/Source/Core/Core/GeckoCode.cpp @@ -96,10 +96,10 @@ static bool InstallCodeHandler() for (unsigned int h = 0; h < data.length(); h += 4) { // Patch MMIO address - if (Memory::ReadUnchecked_U32(INSTALLER_BASE_ADDRESS + h) == (0x3f000000 | ((mmioAddr ^ 1) << 8))) + if (Memory::ReadUnchecked_U32(INSTALLER_BASE_ADDRESS + h) == (0x3f000000u | ((mmioAddr ^ 1) << 8))) { NOTICE_LOG(ACTIONREPLAY, "Patching MMIO access at %08x", INSTALLER_BASE_ADDRESS + h); - Memory::Write_U32(0x3f000000 | mmioAddr << 8, INSTALLER_BASE_ADDRESS + h); + Memory::Write_U32(0x3f000000u | mmioAddr << 8, INSTALLER_BASE_ADDRESS + h); } } diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index 6589ef7571..1800c8bb04 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp @@ -184,22 +184,6 @@ static inline void DecodeBytes_IA4(u32 *dst, const u8 *src) } } -static inline void DecodeBytes_RGB5A3(u32 *dst, const u16 *src) -{ - dst[0] = DecodePixel_RGB5A3(Common::swap16(src[0])); - dst[1] = DecodePixel_RGB5A3(Common::swap16(src[1])); - dst[2] = DecodePixel_RGB5A3(Common::swap16(src[2])); - dst[3] = DecodePixel_RGB5A3(Common::swap16(src[3])); -} - -static inline void DecodeBytes_RGBA8(u32 *dst, const u16 *src, const u16 * src2) -{ - dst[0] = ((src[0] & 0xFF) << 24) | ((src[0] & 0xFF00)>>8) | (src2[0] << 8); - dst[1] = ((src[1] & 0xFF) << 24) | ((src[1] & 0xFF00)>>8) | (src2[1] << 8); - dst[2] = ((src[2] & 0xFF) << 24) | ((src[2] & 0xFF00)>>8) | (src2[2] << 8); - dst[3] = ((src[3] & 0xFF) << 24) | ((src[3] & 0xFF00)>>8) | (src2[3] << 8); -} - #ifdef CHECK static inline u32 makeRGBA(int r, int g, int b, int a) {