summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/data_compression.cpp24
-rw-r--r--src/common/data_compression.h8
-rw-r--r--src/video_core/renderer_opengl/gl_shader_disk_cache.cpp4
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 @@
4 4
5#pragma once 5#pragma once
6 6
7#include <lz4.h> 7#include <lz4hc.h>
8 8
9#include "data_compression.h" 9#include "data_compression.h"
10 10
11namespace Compression { 11namespace Compression {
12 12
13 13std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size,
14std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size) { 14 bool use_LZ4_high_compression) {
15 if (source_size > LZ4_MAX_INPUT_SIZE) { 15 if (source_size > LZ4_MAX_INPUT_SIZE) {
16 // Source size exceeds LZ4 maximum input size 16 // Source size exceeds LZ4 maximum input size
17 return {}; 17 return {};
@@ -19,9 +19,18 @@ std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size) {
19 const auto source_size_int = static_cast<int>(source_size); 19 const auto source_size_int = static_cast<int>(source_size);
20 const int max_compressed_size = LZ4_compressBound(source_size_int); 20 const int max_compressed_size = LZ4_compressBound(source_size_int);
21 std::vector<u8> compressed(max_compressed_size); 21 std::vector<u8> compressed(max_compressed_size);
22 const int compressed_size = LZ4_compress_default(reinterpret_cast<const char*>(source), 22 int compressed_size = 0;
23 reinterpret_cast<char*>(compressed.data()), 23
24 source_size_int, max_compressed_size); 24 if (use_LZ4_high_compression) {
25 compressed_size = LZ4_compress_HC(reinterpret_cast<const char*>(source),
26 reinterpret_cast<char*>(compressed.data()),
27 source_size_int, max_compressed_size, LZ4HC_CLEVEL_MAX);
28 } else {
29 compressed_size = LZ4_compress_default(reinterpret_cast<const char*>(source),
30 reinterpret_cast<char*>(compressed.data()),
31 source_size_int, max_compressed_size);
32 }
33
25 if (compressed_size <= 0) { 34 if (compressed_size <= 0) {
26 // Compression failed 35 // Compression failed
27 return {}; 36 return {};
@@ -30,7 +39,8 @@ std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size) {
30 return compressed; 39 return compressed;
31} 40}
32 41
33std::vector<u8> DecompressDataLZ4(const std::vector<u8>& compressed, std::size_t uncompressed_size) { 42std::vector<u8> DecompressDataLZ4(const std::vector<u8>& compressed,
43 std::size_t uncompressed_size) {
34 std::vector<u8> uncompressed(uncompressed_size); 44 std::vector<u8> uncompressed(uncompressed_size);
35 const int size_check = LZ4_decompress_safe(reinterpret_cast<const char*>(compressed.data()), 45 const int size_check = LZ4_decompress_safe(reinterpret_cast<const char*>(compressed.data()),
36 reinterpret_cast<char*>(uncompressed.data()), 46 reinterpret_cast<char*>(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 @@
10 10
11namespace Compression { 11namespace Compression {
12 12
13std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size); 13// Compresses a source memory region with LZ4 and returns the compressed data in an vector. If
14// use_LZ4_high_compression is true, the LZ4 subalgortihmn LZ4HC is used with the highst possible
15// compression level. This results in a smaller compressed size, but requires more CPU time for
16// compression. Data compressed with LZ4HC can also be decompressed with the default LZ4
17// decompression function.
18std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size,
19 bool use_LZ4_high_compression);
14 20
15std::vector<u8> DecompressDataLZ4(const std::vector<u8>& compressed, std::size_t uncompressed_size); 21std::vector<u8> DecompressDataLZ4(const std::vector<u8>& compressed, std::size_t uncompressed_size);
16 22
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
475 return; 475 return;
476 476
477 const std::vector<u8> compressed_code{ 477 const std::vector<u8> compressed_code{
478 Compression::CompressDataLZ4(reinterpret_cast<const u8*>(code.data()), code.size())}; 478 Compression::CompressDataLZ4(reinterpret_cast<const u8*>(code.data()), code.size(), true)};
479 if (compressed_code.empty()) { 479 if (compressed_code.empty()) {
480 LOG_ERROR(Render_OpenGL, "Failed to compress GLSL code - skipping shader {:016x}", 480 LOG_ERROR(Render_OpenGL, "Failed to compress GLSL code - skipping shader {:016x}",
481 unique_identifier); 481 unique_identifier);
@@ -506,7 +506,7 @@ void ShaderDiskCacheOpenGL::SaveDump(const ShaderDiskCacheUsage& usage, GLuint p
506 glGetProgramBinary(program, binary_length, nullptr, &binary_format, binary.data()); 506 glGetProgramBinary(program, binary_length, nullptr, &binary_format, binary.data());
507 507
508 const std::vector<u8> compressed_binary = 508 const std::vector<u8> compressed_binary =
509 Compression::CompressDataLZ4(binary.data(), binary.size()); 509 Compression::CompressDataLZ4(binary.data(), binary.size(), true);
510 510
511 if (compressed_binary.empty()) { 511 if (compressed_binary.empty()) {
512 LOG_ERROR(Render_OpenGL, "Failed to compress binary program in shader={:016x}", 512 LOG_ERROR(Render_OpenGL, "Failed to compress binary program in shader={:016x}",