summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar unknown2019-02-08 06:45:50 +0100
committerGravatar FreddyFunk2019-03-29 18:12:42 +0100
commitc791192d649cf01483dbea9907c6d13909b8e5a3 (patch)
tree1b62eaf1f16edfe93ce84c61bed9357d55e1e4e6 /src/video_core
parentcore: Do not link LZ4 to core. Use common/data_compression for nso segment de... (diff)
downloadyuzu-c791192d649cf01483dbea9907c6d13909b8e5a3.tar.gz
yuzu-c791192d649cf01483dbea9907c6d13909b8e5a3.tar.xz
yuzu-c791192d649cf01483dbea9907c6d13909b8e5a3.zip
Addressed feedback
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_disk_cache.cpp12
1 files changed, 6 insertions, 6 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 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 @@
8#include "common/assert.h" 8#include "common/assert.h"
9#include "common/common_paths.h" 9#include "common/common_paths.h"
10#include "common/common_types.h" 10#include "common/common_types.h"
11#include "common/data_compression.h"
12#include "common/file_util.h" 11#include "common/file_util.h"
13#include "common/logging/log.h" 12#include "common/logging/log.h"
13#include "common/lz4_compression.h"
14#include "common/scm_rev.h" 14#include "common/scm_rev.h"
15 15
16#include "core/core.h" 16#include "core/core.h"
@@ -259,7 +259,7 @@ ShaderDiskCacheOpenGL::LoadPrecompiledFile(FileUtil::IOFile& file) {
259 return {}; 259 return {};
260 } 260 }
261 261
262 dump.binary = Compression::DecompressDataLZ4(compressed_binary, binary_length); 262 dump.binary = Common::Compression::DecompressDataLZ4(compressed_binary, binary_length);
263 if (dump.binary.empty()) { 263 if (dump.binary.empty()) {
264 return {}; 264 return {};
265 } 265 }
@@ -288,7 +288,7 @@ std::optional<ShaderDiskCacheDecompiled> ShaderDiskCacheOpenGL::LoadDecompiledEn
288 return {}; 288 return {};
289 } 289 }
290 290
291 const std::vector<u8> code = Compression::DecompressDataLZ4(compressed_code, code_size); 291 const std::vector<u8> code = Common::Compression::DecompressDataLZ4(compressed_code, code_size);
292 if (code.empty()) { 292 if (code.empty()) {
293 return {}; 293 return {};
294 } 294 }
@@ -474,8 +474,8 @@ void ShaderDiskCacheOpenGL::SaveDecompiled(u64 unique_identifier, const std::str
474 if (!IsUsable()) 474 if (!IsUsable())
475 return; 475 return;
476 476
477 const std::vector<u8> compressed_code{ 477 const std::vector<u8> compressed_code{Common::Compression::CompressDataLZ4HCMax(
478 Compression::CompressDataLZ4(reinterpret_cast<const u8*>(code.data()), code.size(), true)}; 478 reinterpret_cast<const u8*>(code.data()), code.size())};
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(), true); 509 Common::Compression::CompressDataLZ4HCMax(binary.data(), binary.size());
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}",