From 798d76f4c7018174e58702fb06a042dc8c84f0be Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Feb 2019 18:28:06 +0100 Subject: [PATCH] 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);