notsoyuzu
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common/zstd_compression: simplify decompression interface

This commit is contained in:
unknown 2019-02-10 10:28:04 +01:00 committed by FreddyFunk
parent aa92da205e
commit b4857e326f
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/zstd_compression.cpp
View File

@ -13,7 +13,6 @@
namespace Common::Compression { namespace Common::Compression {
std::vector<u8> CompressDataZSTD(const u8* source, std::size_t source_size, s32 compression_level) { std::vector<u8> CompressDataZSTD(const u8* source, std::size_t source_size, s32 compression_level) {
compression_level = std::clamp(compression_level, 1, ZSTD_maxCLevel()); compression_level = std::clamp(compression_level, 1, ZSTD_maxCLevel());
const std::size_t max_compressed_size = ZSTD_compressBound(source_size); const std::size_t max_compressed_size = ZSTD_compressBound(source_size);
@ -36,17 +35,19 @@ std::vector<u8> CompressDataZSTDDefault(const u8* source, std::size_t source_siz
return CompressDataZSTD(source, source_size, ZSTD_CLEVEL_DEFAULT); return CompressDataZSTD(source, source_size, ZSTD_CLEVEL_DEFAULT);
} }
std::vector<u8> DecompressDataZSTD(const std::vector<u8>& compressed, std::vector<u8> DecompressDataZSTD(const std::vector<u8>& compressed) {
std::size_t uncompressed_size) { const std::size_t decompressed_size =
std::vector<u8> uncompressed(uncompressed_size); ZSTD_getDecompressedSize(compressed.data(), compressed.size());
const std::size_t uncompressed_result_size = ZSTD_decompress( std::vector<u8> decompressed(decompressed_size);
uncompressed.data(), uncompressed.size(), compressed.data(), compressed.size());
if (uncompressed_size != uncompressed_result_size || ZSTD_isError(uncompressed_result_size)) { const std::size_t uncompressed_result_size = ZSTD_decompress(
decompressed.data(), decompressed.size(), compressed.data(), compressed.size());
if (decompressed_size != uncompressed_result_size || ZSTD_isError(uncompressed_result_size)) {
// Decompression failed // Decompression failed
return {}; return {};
} }
return uncompressed; return decompressed;
} }
} // namespace Common::Compression } // namespace Common::Compression

4
src/common/zstd_compression.h
View File

@ -34,11 +34,9 @@ std::vector<u8> CompressDataZSTDDefault(const u8* source, std::size_t source_siz
* Decompresses a source memory region with Zstandard and returns the uncompressed data in a vector. * Decompresses a source memory region with Zstandard and returns the uncompressed data in a vector.
* *
* @param compressed the compressed source memory region. * @param compressed the compressed source memory region.
* @param uncompressed_size the size in bytes of the uncompressed data.
* *
* @return the decompressed data. * @return the decompressed data.
*/ */
std::vector<u8> DecompressDataZSTD(const std::vector<u8>& compressed, std::vector<u8> DecompressDataZSTD(const std::vector<u8>& compressed);
std::size_t uncompressed_size);
} // namespace Common::Compression } // namespace Common::Compression

5
src/video_core/renderer_opengl/gl_shader_disk_cache.cpp
View File

@ -259,7 +259,7 @@ ShaderDiskCacheOpenGL::LoadPrecompiledFile(FileUtil::IOFile& file) {
return {}; return {};
} }
dump.binary = Common::Compression::DecompressDataZSTD(compressed_binary, binary_length); dump.binary = Common::Compression::DecompressDataZSTD(compressed_binary);
if (dump.binary.empty()) { if (dump.binary.empty()) {
return {}; return {};
} }
@ -288,8 +288,7 @@ std::optional<ShaderDiskCacheDecompiled> ShaderDiskCacheOpenGL::LoadDecompiledEn
return {}; return {};
} }
const std::vector<u8> code = const std::vector<u8> code = Common::Compression::DecompressDataZSTD(compressed_code);
Common::Compression::DecompressDataZSTD(compressed_code, code_size);
if (code.empty()) { if (code.empty()) {
return {}; return {};
} }