From c5bdccfecb279ba581e5931f7fd9678d1aaa8f85 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 25 Jul 2020 03:11:14 -0400 Subject: [PATCH 1/2] zstd_compression: Make use of std::span in interfaces Allows condensing the data and size parameters into a single argument. --- src/common/zstd_compression.cpp | 13 ++++++------- src/common/zstd_compression.h | 7 +++---- .../renderer_opengl/gl_shader_disk_cache.cpp | 3 +-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/common/zstd_compression.cpp b/src/common/zstd_compression.cpp index 978526492..770833ee7 100644 --- a/src/common/zstd_compression.cpp +++ b/src/common/zstd_compression.cpp @@ -5,19 +5,18 @@ #include #include -#include "common/assert.h" #include "common/zstd_compression.h" namespace Common::Compression { -std::vector CompressDataZSTD(const u8* source, std::size_t source_size, s32 compression_level) { +std::vector CompressDataZSTD(std::span source, s32 compression_level) { 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()); std::vector compressed(max_compressed_size); - const std::size_t compressed_size = - ZSTD_compress(compressed.data(), compressed.size(), source, source_size, compression_level); + const std::size_t compressed_size = ZSTD_compress( + compressed.data(), compressed.size(), source.data(), source.size(), compression_level); if (ZSTD_isError(compressed_size)) { // Compression failed @@ -29,8 +28,8 @@ std::vector CompressDataZSTD(const u8* source, std::size_t source_size, s32 return compressed; } -std::vector CompressDataZSTDDefault(const u8* source, std::size_t source_size) { - return CompressDataZSTD(source, source_size, ZSTD_CLEVEL_DEFAULT); +std::vector CompressDataZSTDDefault(std::span source) { + return CompressDataZSTD(source, ZSTD_CLEVEL_DEFAULT); } std::vector DecompressDataZSTD(const std::vector& compressed) { diff --git a/src/common/zstd_compression.h b/src/common/zstd_compression.h index e9de941c8..b5edf19e7 100644 --- a/src/common/zstd_compression.h +++ b/src/common/zstd_compression.h @@ -4,6 +4,7 @@ #pragma once +#include #include #include "common/common_types.h" @@ -14,23 +15,21 @@ namespace Common::Compression { * Compresses a source memory region with Zstandard and returns the compressed data in a vector. * * @param source the uncompressed source memory region. - * @param source_size the size in bytes of the uncompressed source memory region. * @param compression_level the used compression level. Should be between 1 and 22. * * @return the compressed data. */ -std::vector CompressDataZSTD(const u8* source, std::size_t source_size, s32 compression_level); +std::vector CompressDataZSTD(std::span source, s32 compression_level); /** * Compresses a source memory region with Zstandard with the default compression level and returns * the compressed data in a vector. * * @param source the uncompressed source memory region. - * @param source_size the size in bytes of the uncompressed source memory region. * * @return the compressed data. */ -std::vector CompressDataZSTDDefault(const u8* source, std::size_t source_size); +std::vector CompressDataZSTDDefault(std::span source); /** * Decompresses a source memory region with Zstandard and returns the uncompressed data in a vector. 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 2dcc2b0eb..c0e73789b 100644 --- a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp @@ -422,8 +422,7 @@ void ShaderDiskCacheOpenGL::SavePrecompiledHeaderToVirtualPrecompiledCache() { void ShaderDiskCacheOpenGL::SaveVirtualPrecompiledFile() { precompiled_cache_virtual_file_offset = 0; const std::vector uncompressed = precompiled_cache_virtual_file.ReadAllBytes(); - const std::vector compressed = - Common::Compression::CompressDataZSTDDefault(uncompressed.data(), uncompressed.size()); + const std::vector compressed = Common::Compression::CompressDataZSTDDefault(uncompressed); const auto precompiled_path{GetPrecompiledPath()}; FileUtil::IOFile file(precompiled_path, "wb"); From 2e511246fa99ad6a9f9cf1bbb8cf35a51382cd19 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 25 Jul 2020 03:17:01 -0400 Subject: [PATCH 2/2] lz4_compression: Make use of std::span in interfaces Allows compressing the data and size parameters into one. --- src/common/lz4_compression.cpp | 21 ++++++++++----------- src/common/lz4_compression.h | 10 ++++------ 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/common/lz4_compression.cpp b/src/common/lz4_compression.cpp index ade6759bb..8e2e4094b 100644 --- a/src/common/lz4_compression.cpp +++ b/src/common/lz4_compression.cpp @@ -10,14 +10,14 @@ namespace Common::Compression { -std::vector CompressDataLZ4(const u8* source, std::size_t source_size) { - ASSERT_MSG(source_size <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); +std::vector CompressDataLZ4(std::span source) { + ASSERT_MSG(source.size() <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); - const auto source_size_int = static_cast(source_size); + 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), + const int compressed_size = LZ4_compress_default(reinterpret_cast(source.data()), reinterpret_cast(compressed.data()), source_size_int, max_compressed_size); @@ -31,18 +31,17 @@ std::vector CompressDataLZ4(const u8* source, std::size_t source_size) { return compressed; } -std::vector CompressDataLZ4HC(const u8* source, std::size_t source_size, - s32 compression_level) { - ASSERT_MSG(source_size <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); +std::vector CompressDataLZ4HC(std::span source, s32 compression_level) { + ASSERT_MSG(source.size() <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); compression_level = std::clamp(compression_level, LZ4HC_CLEVEL_MIN, LZ4HC_CLEVEL_MAX); - const auto source_size_int = static_cast(source_size); + 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_HC( - reinterpret_cast(source), reinterpret_cast(compressed.data()), + reinterpret_cast(source.data()), reinterpret_cast(compressed.data()), source_size_int, max_compressed_size, compression_level); if (compressed_size <= 0) { @@ -55,8 +54,8 @@ std::vector CompressDataLZ4HC(const u8* source, std::size_t source_size, return compressed; } -std::vector CompressDataLZ4HCMax(const u8* source, std::size_t source_size) { - return CompressDataLZ4HC(source, source_size, LZ4HC_CLEVEL_MAX); +std::vector CompressDataLZ4HCMax(std::span source) { + return CompressDataLZ4HC(source, LZ4HC_CLEVEL_MAX); } std::vector DecompressDataLZ4(const std::vector& compressed, diff --git a/src/common/lz4_compression.h b/src/common/lz4_compression.h index 4c16f6e03..173f9b9ad 100644 --- a/src/common/lz4_compression.h +++ b/src/common/lz4_compression.h @@ -4,6 +4,7 @@ #pragma once +#include #include #include "common/common_types.h" @@ -14,11 +15,10 @@ namespace Common::Compression { * Compresses a source memory region with LZ4 and returns the compressed data in a vector. * * @param source the uncompressed source memory region. - * @param source_size the size in bytes of the uncompressed source memory region. * * @return the compressed data. */ -std::vector CompressDataLZ4(const u8* source, std::size_t source_size); +std::vector CompressDataLZ4(std::span source); /** * Utilizes the LZ4 subalgorithm LZ4HC with the specified compression level. Higher compression @@ -27,22 +27,20 @@ std::vector CompressDataLZ4(const u8* source, std::size_t source_size); * also be decompressed with the default LZ4 decompression. * * @param source the uncompressed source memory region. - * @param source_size the size in bytes of the uncompressed source memory region. * @param compression_level the used compression level. Should be between 3 and 12. * * @return the compressed data. */ -std::vector CompressDataLZ4HC(const u8* source, std::size_t source_size, s32 compression_level); +std::vector CompressDataLZ4HC(std::span source, s32 compression_level); /** * Utilizes the LZ4 subalgorithm LZ4HC with the highest possible compression level. * * @param source the uncompressed source memory region. - * @param source_size the size in bytes of the uncompressed source memory region. * * @return the compressed data. */ -std::vector CompressDataLZ4HCMax(const u8* source, std::size_t source_size); +std::vector CompressDataLZ4HCMax(std::span source); /** * Decompresses a source memory region with LZ4 and returns the uncompressed data in a vector.