From 798d76f4c7018174e58702fb06a042dc8c84f0be Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Feb 2019 18:28:06 +0100 Subject: [PATCH 1/5] data_compression: Move LZ4 compression from video_core/gl_shader_disk_cache to common/data_compression --- src/common/CMakeLists.txt | 3 ++ src/common/data_compression.cpp | 46 +++++++++++++++++++ src/common/data_compression.h | 17 +++++++ src/video_core/CMakeLists.txt | 2 +- .../renderer_opengl/gl_shader_disk_cache.cpp | 46 ++++--------------- 5 files changed, 75 insertions(+), 39 deletions(-) create mode 100644 src/common/data_compression.cpp create mode 100644 src/common/data_compression.h diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 850ce8006..43834eb85 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -79,6 +79,8 @@ add_library(common STATIC common_funcs.h common_paths.h common_types.h + data_compression.cpp + data_compression.h file_util.cpp file_util.h hash.h @@ -136,3 +138,4 @@ endif() create_target_directory_groups(common) target_link_libraries(common PUBLIC Boost::boost fmt microprofile) +target_link_libraries(common PRIVATE lz4_static) diff --git a/src/common/data_compression.cpp b/src/common/data_compression.cpp new file mode 100644 index 000000000..624b8ac47 --- /dev/null +++ b/src/common/data_compression.cpp @@ -0,0 +1,46 @@ +// Copyright 2019 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include + +#include "data_compression.h" + +namespace Compression { + + +std::vector CompressDataLZ4(const u8* source, std::size_t source_size) { + if (source_size > LZ4_MAX_INPUT_SIZE) { + // Source size exceeds LZ4 maximum input size + return {}; + } + const auto source_size_int = static_cast(source_size); + const int max_compressed_size = LZ4_compressBound(source_size_int); + std::vector compressed(max_compressed_size); + const int compressed_size = LZ4_compress_default(reinterpret_cast(source), + reinterpret_cast(compressed.data()), + source_size_int, max_compressed_size); + if (compressed_size <= 0) { + // Compression failed + return {}; + } + compressed.resize(compressed_size); + return compressed; +} + +std::vector DecompressDataLZ4(const std::vector& compressed, std::size_t uncompressed_size) { + std::vector uncompressed(uncompressed_size); + const int size_check = LZ4_decompress_safe(reinterpret_cast(compressed.data()), + reinterpret_cast(uncompressed.data()), + static_cast(compressed.size()), + static_cast(uncompressed.size())); + if (static_cast(uncompressed_size) != size_check) { + // Decompression failed + return {}; + } + return uncompressed; +} + +} // namespace Compression diff --git a/src/common/data_compression.h b/src/common/data_compression.h new file mode 100644 index 000000000..70878b8d9 --- /dev/null +++ b/src/common/data_compression.h @@ -0,0 +1,17 @@ +// Copyright 2019 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include + +#include "common/common_types.h" + +namespace Compression { + +std::vector CompressDataLZ4(const u8* source, std::size_t source_size); + +std::vector DecompressDataLZ4(const std::vector& compressed, std::size_t uncompressed_size); + +} // namespace Compression \ No newline at end of file diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 14b76680f..d5695638b 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -137,4 +137,4 @@ endif() create_target_directory_groups(video_core) target_link_libraries(video_core PUBLIC common core) -target_link_libraries(video_core PRIVATE glad lz4_static) +target_link_libraries(video_core PRIVATE glad) diff --git a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp index 82fc4d44b..a74b66a90 100644 --- a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp @@ -4,11 +4,11 @@ #include #include -#include #include "common/assert.h" #include "common/common_paths.h" #include "common/common_types.h" +#include "common/data_compression.h" #include "common/file_util.h" #include "common/logging/log.h" #include "common/scm_rev.h" @@ -49,39 +49,6 @@ ShaderCacheVersionHash GetShaderCacheVersionHash() { return hash; } -template -std::vector CompressData(const T* source, std::size_t source_size) { - if (source_size > LZ4_MAX_INPUT_SIZE) { - // Source size exceeds LZ4 maximum input size - return {}; - } - const auto source_size_int = static_cast(source_size); - const int max_compressed_size = LZ4_compressBound(source_size_int); - std::vector compressed(max_compressed_size); - const int compressed_size = LZ4_compress_default(reinterpret_cast(source), - reinterpret_cast(compressed.data()), - source_size_int, max_compressed_size); - if (compressed_size <= 0) { - // Compression failed - return {}; - } - compressed.resize(compressed_size); - return compressed; -} - -std::vector DecompressData(const std::vector& compressed, std::size_t uncompressed_size) { - std::vector uncompressed(uncompressed_size); - const int size_check = LZ4_decompress_safe(reinterpret_cast(compressed.data()), - reinterpret_cast(uncompressed.data()), - static_cast(compressed.size()), - static_cast(uncompressed.size())); - if (static_cast(uncompressed_size) != size_check) { - // Decompression failed - return {}; - } - return uncompressed; -} - } // namespace ShaderDiskCacheRaw::ShaderDiskCacheRaw(u64 unique_identifier, Maxwell::ShaderProgram program_type, @@ -292,7 +259,7 @@ ShaderDiskCacheOpenGL::LoadPrecompiledFile(FileUtil::IOFile& file) { return {}; } - dump.binary = DecompressData(compressed_binary, binary_length); + dump.binary = Compression::DecompressDataLZ4(compressed_binary, binary_length); if (dump.binary.empty()) { return {}; } @@ -321,7 +288,7 @@ std::optional ShaderDiskCacheOpenGL::LoadDecompiledEn return {}; } - const std::vector code = DecompressData(compressed_code, code_size); + const std::vector code = Compression::DecompressDataLZ4(compressed_code, code_size); if (code.empty()) { return {}; } @@ -507,7 +474,8 @@ void ShaderDiskCacheOpenGL::SaveDecompiled(u64 unique_identifier, const std::str if (!IsUsable()) return; - const std::vector compressed_code{CompressData(code.data(), code.size())}; + const std::vector compressed_code{ + Compression::CompressDataLZ4(reinterpret_cast(code.data()), code.size())}; if (compressed_code.empty()) { LOG_ERROR(Render_OpenGL, "Failed to compress GLSL code - skipping shader {:016x}", unique_identifier); @@ -537,7 +505,9 @@ void ShaderDiskCacheOpenGL::SaveDump(const ShaderDiskCacheUsage& usage, GLuint p std::vector binary(binary_length); glGetProgramBinary(program, binary_length, nullptr, &binary_format, binary.data()); - const std::vector compressed_binary = CompressData(binary.data(), binary.size()); + const std::vector compressed_binary = + Compression::CompressDataLZ4(binary.data(), binary.size()); + if (compressed_binary.empty()) { LOG_ERROR(Render_OpenGL, "Failed to compress binary program in shader={:016x}", usage.unique_identifier); From 74cee1b65d1c27006c44051c7c8228bbb4827eb7 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Feb 2019 19:18:49 +0100 Subject: [PATCH 2/5] gl_shader_disk_cache: Use better compression for transferable and precompiled shader disk chache files --- src/common/data_compression.cpp | 24 +++++++++++++------ src/common/data_compression.h | 8 ++++++- .../renderer_opengl/gl_shader_disk_cache.cpp | 4 ++-- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/common/data_compression.cpp b/src/common/data_compression.cpp index 624b8ac47..fdf4907d1 100644 --- a/src/common/data_compression.cpp +++ b/src/common/data_compression.cpp @@ -4,14 +4,14 @@ #pragma once -#include +#include #include "data_compression.h" namespace Compression { - -std::vector CompressDataLZ4(const u8* source, std::size_t source_size) { +std::vector CompressDataLZ4(const u8* source, std::size_t source_size, + bool use_LZ4_high_compression) { if (source_size > LZ4_MAX_INPUT_SIZE) { // Source size exceeds LZ4 maximum input size return {}; @@ -19,9 +19,18 @@ std::vector CompressDataLZ4(const u8* source, std::size_t source_size) { const auto source_size_int = static_cast(source_size); const int max_compressed_size = LZ4_compressBound(source_size_int); std::vector compressed(max_compressed_size); - const int compressed_size = LZ4_compress_default(reinterpret_cast(source), - reinterpret_cast(compressed.data()), - source_size_int, max_compressed_size); + int compressed_size = 0; + + if (use_LZ4_high_compression) { + compressed_size = LZ4_compress_HC(reinterpret_cast(source), + reinterpret_cast(compressed.data()), + source_size_int, max_compressed_size, LZ4HC_CLEVEL_MAX); + } else { + compressed_size = LZ4_compress_default(reinterpret_cast(source), + reinterpret_cast(compressed.data()), + source_size_int, max_compressed_size); + } + if (compressed_size <= 0) { // Compression failed return {}; @@ -30,7 +39,8 @@ std::vector CompressDataLZ4(const u8* source, std::size_t source_size) { return compressed; } -std::vector DecompressDataLZ4(const std::vector& compressed, std::size_t uncompressed_size) { +std::vector DecompressDataLZ4(const std::vector& compressed, + std::size_t uncompressed_size) { std::vector uncompressed(uncompressed_size); const int size_check = LZ4_decompress_safe(reinterpret_cast(compressed.data()), reinterpret_cast(uncompressed.data()), diff --git a/src/common/data_compression.h b/src/common/data_compression.h index 70878b8d9..f7264b7b8 100644 --- a/src/common/data_compression.h +++ b/src/common/data_compression.h @@ -10,7 +10,13 @@ namespace Compression { -std::vector CompressDataLZ4(const u8* source, std::size_t source_size); +// Compresses a source memory region with LZ4 and returns the compressed data in an vector. If +// use_LZ4_high_compression is true, the LZ4 subalgortihmn LZ4HC is used with the highst possible +// compression level. This results in a smaller compressed size, but requires more CPU time for +// compression. Data compressed with LZ4HC can also be decompressed with the default LZ4 +// decompression function. +std::vector CompressDataLZ4(const u8* source, std::size_t source_size, + bool use_LZ4_high_compression); std::vector DecompressDataLZ4(const std::vector& compressed, std::size_t uncompressed_size); diff --git a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp index a74b66a90..0c8001b19 100644 --- a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp @@ -475,7 +475,7 @@ void ShaderDiskCacheOpenGL::SaveDecompiled(u64 unique_identifier, const std::str return; const std::vector compressed_code{ - Compression::CompressDataLZ4(reinterpret_cast(code.data()), code.size())}; + Compression::CompressDataLZ4(reinterpret_cast(code.data()), code.size(), true)}; if (compressed_code.empty()) { LOG_ERROR(Render_OpenGL, "Failed to compress GLSL code - skipping shader {:016x}", unique_identifier); @@ -506,7 +506,7 @@ void ShaderDiskCacheOpenGL::SaveDump(const ShaderDiskCacheUsage& usage, GLuint p glGetProgramBinary(program, binary_length, nullptr, &binary_format, binary.data()); const std::vector compressed_binary = - Compression::CompressDataLZ4(binary.data(), binary.size()); + Compression::CompressDataLZ4(binary.data(), binary.size(), true); if (compressed_binary.empty()) { LOG_ERROR(Render_OpenGL, "Failed to compress binary program in shader={:016x}", From 6a1a2d4aa54c314b372477bfaeb91e44cebe7df0 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Feb 2019 19:40:39 +0100 Subject: [PATCH 3/5] core: Do not link LZ4 to core. Use common/data_compression for nso segment decompression instead. --- src/core/CMakeLists.txt | 2 +- src/core/loader/nso.cpp | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 9e23afe85..c59107102 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -458,7 +458,7 @@ add_library(core STATIC create_target_directory_groups(core) target_link_libraries(core PUBLIC common PRIVATE audio_core video_core) -target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt lz4_static mbedtls opus unicorn open_source_archives) +target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt mbedtls opus unicorn open_source_archives) if (ENABLE_WEB_SERVICE) target_compile_definitions(core PRIVATE -DENABLE_WEB_SERVICE) target_link_libraries(core PRIVATE web_service) diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 714d85a59..8aeabe409 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -4,7 +4,8 @@ #include #include -#include + +#include "common/data_compression.h" #include "common/common_funcs.h" #include "common/file_util.h" #include "common/hex_util.h" @@ -35,15 +36,11 @@ static_assert(sizeof(MODHeader) == 0x1c, "MODHeader has incorrect size."); std::vector DecompressSegment(const std::vector& compressed_data, const NSOSegmentHeader& header) { - std::vector uncompressed_data(header.size); - const int bytes_uncompressed = - LZ4_decompress_safe(reinterpret_cast(compressed_data.data()), - reinterpret_cast(uncompressed_data.data()), - static_cast(compressed_data.size()), header.size); + const std::vector uncompressed_data = + Compression::DecompressDataLZ4(compressed_data, header.size); - ASSERT_MSG(bytes_uncompressed == static_cast(header.size) && - bytes_uncompressed == static_cast(uncompressed_data.size()), - "{} != {} != {}", bytes_uncompressed, header.size, uncompressed_data.size()); + ASSERT_MSG(uncompressed_data.size() == static_cast(header.size), + "{} != {}", header.size, uncompressed_data.size()); return uncompressed_data; } From c791192d649cf01483dbea9907c6d13909b8e5a3 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 8 Feb 2019 06:45:50 +0100 Subject: [PATCH 4/5] Addressed feedback --- src/common/CMakeLists.txt | 4 +- src/common/data_compression.cpp | 56 ------------- src/common/data_compression.h | 23 ------ src/common/lz4_compression.cpp | 78 +++++++++++++++++++ src/common/lz4_compression.h | 55 +++++++++++++ src/core/loader/nso.cpp | 8 +- .../renderer_opengl/gl_shader_disk_cache.cpp | 12 +-- 7 files changed, 145 insertions(+), 91 deletions(-) delete mode 100644 src/common/data_compression.cpp delete mode 100644 src/common/data_compression.h create mode 100644 src/common/lz4_compression.cpp create mode 100644 src/common/lz4_compression.h diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 43834eb85..5639021d3 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -79,8 +79,6 @@ add_library(common STATIC common_funcs.h common_paths.h common_types.h - data_compression.cpp - data_compression.h file_util.cpp file_util.h hash.h @@ -93,6 +91,8 @@ add_library(common STATIC logging/log.h logging/text_formatter.cpp logging/text_formatter.h + lz4_compression.cpp + lz4_compression.h math_util.h memory_hook.cpp memory_hook.h diff --git a/src/common/data_compression.cpp b/src/common/data_compression.cpp deleted file mode 100644 index fdf4907d1..000000000 --- a/src/common/data_compression.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2019 yuzu Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -#include - -#include "data_compression.h" - -namespace Compression { - -std::vector CompressDataLZ4(const u8* source, std::size_t source_size, - bool use_LZ4_high_compression) { - if (source_size > LZ4_MAX_INPUT_SIZE) { - // Source size exceeds LZ4 maximum input size - return {}; - } - const auto source_size_int = static_cast(source_size); - const int max_compressed_size = LZ4_compressBound(source_size_int); - std::vector compressed(max_compressed_size); - int compressed_size = 0; - - if (use_LZ4_high_compression) { - compressed_size = LZ4_compress_HC(reinterpret_cast(source), - reinterpret_cast(compressed.data()), - source_size_int, max_compressed_size, LZ4HC_CLEVEL_MAX); - } else { - compressed_size = LZ4_compress_default(reinterpret_cast(source), - reinterpret_cast(compressed.data()), - source_size_int, max_compressed_size); - } - - if (compressed_size <= 0) { - // Compression failed - return {}; - } - compressed.resize(compressed_size); - return compressed; -} - -std::vector DecompressDataLZ4(const std::vector& compressed, - std::size_t uncompressed_size) { - std::vector uncompressed(uncompressed_size); - const int size_check = LZ4_decompress_safe(reinterpret_cast(compressed.data()), - reinterpret_cast(uncompressed.data()), - static_cast(compressed.size()), - static_cast(uncompressed.size())); - if (static_cast(uncompressed_size) != size_check) { - // Decompression failed - return {}; - } - return uncompressed; -} - -} // namespace Compression diff --git a/src/common/data_compression.h b/src/common/data_compression.h deleted file mode 100644 index f7264b7b8..000000000 --- a/src/common/data_compression.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2019 yuzu Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -#include - -#include "common/common_types.h" - -namespace Compression { - -// Compresses a source memory region with LZ4 and returns the compressed data in an vector. If -// use_LZ4_high_compression is true, the LZ4 subalgortihmn LZ4HC is used with the highst possible -// compression level. This results in a smaller compressed size, but requires more CPU time for -// compression. Data compressed with LZ4HC can also be decompressed with the default LZ4 -// decompression function. -std::vector CompressDataLZ4(const u8* source, std::size_t source_size, - bool use_LZ4_high_compression); - -std::vector DecompressDataLZ4(const std::vector& compressed, std::size_t uncompressed_size); - -} // namespace Compression \ No newline at end of file diff --git a/src/common/lz4_compression.cpp b/src/common/lz4_compression.cpp new file mode 100644 index 000000000..dc9b4a916 --- /dev/null +++ b/src/common/lz4_compression.cpp @@ -0,0 +1,78 @@ +// Copyright 2019 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include +#include + +#include "common/assert.h" +#include "common/lz4_compression.h" + +namespace Common::Compression { + +std::vector CompressDataLZ4(const u8* source, std::size_t source_size) { + ASSERT_MSG(source_size <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); + + const auto source_size_int = static_cast(source_size); + const int max_compressed_size = LZ4_compressBound(source_size_int); + std::vector compressed(max_compressed_size); + + const int compressed_size = LZ4_compress_default(reinterpret_cast(source), + reinterpret_cast(compressed.data()), + source_size_int, max_compressed_size); + + if (compressed_size <= 0) { + // Compression failed + return {}; + } + + compressed.resize(compressed_size); + + return compressed; +} + +std::vector CompressDataLZ4HC(const u8* source, std::size_t source_size, + s32 compression_level) { + ASSERT_MSG(source_size <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); + + compression_level = std::clamp(compression_level, LZ4HC_CLEVEL_MIN, LZ4HC_CLEVEL_MAX); + + const auto source_size_int = static_cast(source_size); + const int max_compressed_size = LZ4_compressBound(source_size_int); + std::vector compressed(max_compressed_size); + + const int compressed_size = LZ4_compress_HC( + reinterpret_cast(source), reinterpret_cast(compressed.data()), + source_size_int, max_compressed_size, compression_level); + + if (compressed_size <= 0) { + // Compression failed + return {}; + } + + compressed.resize(compressed_size); + + return compressed; +} + +std::vector CompressDataLZ4HCMax(const u8* source, std::size_t source_size) { + return CompressDataLZ4HC(source, source_size, LZ4HC_CLEVEL_MAX); +} + +std::vector DecompressDataLZ4(const std::vector& compressed, + std::size_t uncompressed_size) { + std::vector uncompressed(uncompressed_size); + const int size_check = LZ4_decompress_safe(reinterpret_cast(compressed.data()), + reinterpret_cast(uncompressed.data()), + static_cast(compressed.size()), + static_cast(uncompressed.size())); + if (static_cast(uncompressed_size) != size_check) { + // Decompression failed + return {}; + } + return uncompressed; +} + +} // namespace Common::Compression diff --git a/src/common/lz4_compression.h b/src/common/lz4_compression.h new file mode 100644 index 000000000..fe2231a6c --- /dev/null +++ b/src/common/lz4_compression.h @@ -0,0 +1,55 @@ +// Copyright 2019 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include + +#include "common/common_types.h" + +namespace Common::Compression { + +/** + * Compresses a source memory region with LZ4 and returns the compressed data in a vector. + * + * @param source the uncompressed source memory region. + * @param source_size the size in bytes of the uncompressed source memory region. + * + * @return the compressed data. + */ +std::vector CompressDataLZ4(const u8* source, std::size_t source_size); + +/** + * Utilizes the LZ4 subalgorithm LZ4HC with the specified compression level. Higher compression + * levels result in a smaller compressed size, but require more CPU time for compression. The + * compression level has almost no impact on decompression speed. Data compressed with LZ4HC can + * also be decompressed with the default LZ4 decompression. + * + * @param source the uncompressed source memory region. + * @param source_size the size in bytes of the uncompressed source memory region. + * @param compression_level the used compression level. Should be between 3 and 12. + * + * @return the compressed data. + */ +std::vector CompressDataLZ4HC(const u8* source, std::size_t source_size, s32 compression_level); + +/** + * Utilizes the LZ4 subalgorithm LZ4HC with the highest possible compression level. + * + * @param source the uncompressed source memory region. + * @param source_size the size in bytes of the uncompressed source memory region. + * + * @return the compressed data. + */ +std::vector CompressDataLZ4HCMax(const u8* source, std::size_t source_size); + +/** + * Decompresses a source memory region with LZ4 and returns the uncompressed data in a vector. + * + * @param compressed the compressed source memory region. + * @param uncompressed_size the size in bytes of the uncompressed data. + * + * @return the decompressed data. + */ +std::vector DecompressDataLZ4(const std::vector& compressed, std::size_t uncompressed_size); + +} // namespace Common::Compression \ No newline at end of file diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 8aeabe409..df2fb7b7f 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -5,11 +5,11 @@ #include #include -#include "common/data_compression.h" #include "common/common_funcs.h" #include "common/file_util.h" #include "common/hex_util.h" #include "common/logging/log.h" +#include "common/lz4_compression.h" #include "common/swap.h" #include "core/core.h" #include "core/file_sys/patch_manager.h" @@ -37,10 +37,10 @@ static_assert(sizeof(MODHeader) == 0x1c, "MODHeader has incorrect size."); std::vector DecompressSegment(const std::vector& compressed_data, const NSOSegmentHeader& header) { const std::vector uncompressed_data = - Compression::DecompressDataLZ4(compressed_data, header.size); + Common::Compression::DecompressDataLZ4(compressed_data, header.size); - ASSERT_MSG(uncompressed_data.size() == static_cast(header.size), - "{} != {}", header.size, uncompressed_data.size()); + ASSERT_MSG(uncompressed_data.size() == static_cast(header.size), "{} != {}", header.size, + uncompressed_data.size()); return uncompressed_data; } diff --git a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp index 0c8001b19..9218d6aaf 100644 --- a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp @@ -8,9 +8,9 @@ #include "common/assert.h" #include "common/common_paths.h" #include "common/common_types.h" -#include "common/data_compression.h" #include "common/file_util.h" #include "common/logging/log.h" +#include "common/lz4_compression.h" #include "common/scm_rev.h" #include "core/core.h" @@ -259,7 +259,7 @@ ShaderDiskCacheOpenGL::LoadPrecompiledFile(FileUtil::IOFile& file) { return {}; } - dump.binary = Compression::DecompressDataLZ4(compressed_binary, binary_length); + dump.binary = Common::Compression::DecompressDataLZ4(compressed_binary, binary_length); if (dump.binary.empty()) { return {}; } @@ -288,7 +288,7 @@ std::optional ShaderDiskCacheOpenGL::LoadDecompiledEn return {}; } - const std::vector code = Compression::DecompressDataLZ4(compressed_code, code_size); + const std::vector code = Common::Compression::DecompressDataLZ4(compressed_code, code_size); if (code.empty()) { return {}; } @@ -474,8 +474,8 @@ void ShaderDiskCacheOpenGL::SaveDecompiled(u64 unique_identifier, const std::str if (!IsUsable()) return; - const std::vector compressed_code{ - Compression::CompressDataLZ4(reinterpret_cast(code.data()), code.size(), true)}; + const std::vector compressed_code{Common::Compression::CompressDataLZ4HCMax( + reinterpret_cast(code.data()), code.size())}; if (compressed_code.empty()) { LOG_ERROR(Render_OpenGL, "Failed to compress GLSL code - skipping shader {:016x}", unique_identifier); @@ -506,7 +506,7 @@ void ShaderDiskCacheOpenGL::SaveDump(const ShaderDiskCacheUsage& usage, GLuint p glGetProgramBinary(program, binary_length, nullptr, &binary_format, binary.data()); const std::vector compressed_binary = - Compression::CompressDataLZ4(binary.data(), binary.size(), true); + Common::Compression::CompressDataLZ4HCMax(binary.data(), binary.size()); if (compressed_binary.empty()) { LOG_ERROR(Render_OpenGL, "Failed to compress binary program in shader={:016x}", From 4fad477aeb98a69a51585d3bafd32dd3ccd6c56f Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 9 Feb 2019 09:12:30 +0100 Subject: [PATCH 5/5] gl_shader_disk_cache: Use LZ4HC with compression level 9 instead of compression level 12 for less compression time --- src/video_core/renderer_opengl/gl_shader_disk_cache.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp index 9218d6aaf..d2d979997 100644 --- a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp @@ -474,8 +474,8 @@ void ShaderDiskCacheOpenGL::SaveDecompiled(u64 unique_identifier, const std::str if (!IsUsable()) return; - const std::vector compressed_code{Common::Compression::CompressDataLZ4HCMax( - reinterpret_cast(code.data()), code.size())}; + const std::vector compressed_code{Common::Compression::CompressDataLZ4HC( + reinterpret_cast(code.data()), code.size(), 9)}; if (compressed_code.empty()) { LOG_ERROR(Render_OpenGL, "Failed to compress GLSL code - skipping shader {:016x}", unique_identifier); @@ -506,7 +506,7 @@ void ShaderDiskCacheOpenGL::SaveDump(const ShaderDiskCacheUsage& usage, GLuint p glGetProgramBinary(program, binary_length, nullptr, &binary_format, binary.data()); const std::vector compressed_binary = - Common::Compression::CompressDataLZ4HCMax(binary.data(), binary.size()); + Common::Compression::CompressDataLZ4HC(binary.data(), binary.size(), 9); if (compressed_binary.empty()) { LOG_ERROR(Render_OpenGL, "Failed to compress binary program in shader={:016x}",