From 798d76f4c7018174e58702fb06a042dc8c84f0be Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Feb 2019 18:28:06 +0100 Subject: data_compression: Move LZ4 compression from video_core/gl_shader_disk_cache to common/data_compression --- src/video_core/CMakeLists.txt | 2 +- .../renderer_opengl/gl_shader_disk_cache.cpp | 46 ++++------------------ 2 files changed, 9 insertions(+), 39 deletions(-) (limited to 'src/video_core') 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); -- cgit v1.2.3 From 74cee1b65d1c27006c44051c7c8228bbb4827eb7 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Feb 2019 19:18:49 +0100 Subject: gl_shader_disk_cache: Use better compression for transferable and precompiled shader disk chache files --- src/video_core/renderer_opengl/gl_shader_disk_cache.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/video_core') 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}", -- cgit v1.2.3 From c791192d649cf01483dbea9907c6d13909b8e5a3 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 8 Feb 2019 06:45:50 +0100 Subject: Addressed feedback --- src/video_core/renderer_opengl/gl_shader_disk_cache.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/video_core') 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}", -- cgit v1.2.3 From 4fad477aeb98a69a51585d3bafd32dd3ccd6c56f Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 9 Feb 2019 09:12:30 +0100 Subject: 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(-) (limited to 'src/video_core') 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}", -- cgit v1.2.3