diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index ee43fba30f..042dbd4e8a 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -986,12 +986,14 @@ TextureCacheBase::GetTexture(u32 address, u32 width, u32 height, const TextureFo dst_buffer = temp; if (!(texformat == TextureFormat::RGBA8 && from_tmem)) { - TexDecoder_Decode(dst_buffer, src_data, expandedWidth, expandedHeight, texformat, tlut, tlutfmt); + TexDecoder_Decode(dst_buffer, src_data, expandedWidth, expandedHeight, texformat, tlut, + tlutfmt); } else { u8* src_data_gb = &texMem[tmem_address_odd]; - TexDecoder_DecodeRGBA8FromTmem(dst_buffer, src_data, src_data_gb, expandedWidth, expandedHeight); + TexDecoder_DecodeRGBA8FromTmem(dst_buffer, src_data, src_data_gb, expandedWidth, + expandedHeight); } entry->texture->Load(0, width, height, expandedWidth, dst_buffer, decoded_texture_size); @@ -1148,8 +1150,7 @@ TextureCacheBase::GetXFBTexture(u32 address, u32 width, u32 height, TextureForma const std::string xfb_type = loaded_from_overlapping ? "combined" : "from_memory"; entry->texture->Save(StringFromFormat("%sxfb_%s_%i.png", File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(), - xfb_type.c_str(), - xfb_count++), + xfb_type.c_str(), xfb_count++), 0); } diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index e11a58a8c6..8a55bb5a53 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp @@ -1494,23 +1494,25 @@ void _TexDecoder_DecodeImpl(u32* dst, const u8* src, int width, int height, Text for (int x = 0; x < width; x += 2) { size_t offset = static_cast((y * width + x) * 2); - + // We do this one color sample (aka 2 RGB pixles) at a time int Y1 = int(src[offset]) - 16; int U = int(src[offset + 1]) - 128; int Y2 = int(src[offset + 2]) - 16; int V = int(src[offset + 3]) - 128; - + // We do the inverse BT.601 conversion for YCbCr to RGB // http://www.equasys.de/colorconversion.html#YCbCr-RGBColorFormatConversion u8 R1 = static_cast(MathUtil::Clamp(int(1.164f * Y1 + 1.596f * V), 0, 255)); - u8 G1 = static_cast(MathUtil::Clamp(int(1.164f * Y1 - 0.392f * U - 0.813f * V), 0, 255)); + u8 G1 = + static_cast(MathUtil::Clamp(int(1.164f * Y1 - 0.392f * U - 0.813f * V), 0, 255)); u8 B1 = static_cast(MathUtil::Clamp(int(1.164f * Y1 + 2.017f * U), 0, 255)); - + u8 R2 = static_cast(MathUtil::Clamp(int(1.164f * Y2 + 1.596f * V), 0, 255)); - u8 G2 = static_cast(MathUtil::Clamp(int(1.164f * Y2 - 0.392f * U - 0.813f * V), 0, 255)); + u8 G2 = + static_cast(MathUtil::Clamp(int(1.164f * Y2 - 0.392f * U - 0.813f * V), 0, 255)); u8 B2 = static_cast(MathUtil::Clamp(int(1.164f * Y2 + 2.017f * U), 0, 255)); - + dst[y * width + x] = 0xff000000 | B1 << 16 | G1 << 8 | R1; dst[y * width + x + 1] = 0xff000000 | B2 << 16 | G2 << 8 | R2; }