From 1ee060ca0dfae7d0a1c830c7495f3125acf0ec7f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 15 Aug 2020 05:25:28 -0400 Subject: [PATCH] common/compression: Roll back std::span changes Seems like all compilers don't support std::span yet. --- src/common/lz4_compression.cpp | 35 ++++++++++--------- src/common/lz4_compression.h | 19 +++++----- src/common/zstd_compression.cpp | 12 +++---- src/common/zstd_compression.h | 14 ++++---- .../renderer_opengl/gl_shader_disk_cache.cpp | 3 +- 5 files changed, 45 insertions(+), 38 deletions(-) diff --git a/src/common/lz4_compression.cpp b/src/common/lz4_compression.cpp index 8e2e4094b5..25700015ab 100644 --- a/src/common/lz4_compression.cpp +++ b/src/common/lz4_compression.cpp @@ -10,52 +10,53 @@ namespace Common::Compression { -std::vector CompressDataLZ4(std::span source) { - ASSERT_MSG(source.size() <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); +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"); - const auto source_size_int = static_cast(source.size()); - const int max_compressed_size = LZ4_compressBound(source_size_int); + const auto source_size_int = static_cast(source_size); + const auto max_compressed_size = static_cast(LZ4_compressBound(source_size_int)); std::vector compressed(max_compressed_size); - const int compressed_size = LZ4_compress_default(reinterpret_cast(source.data()), - reinterpret_cast(compressed.data()), - source_size_int, max_compressed_size); + const int compressed_size = LZ4_compress_default( + reinterpret_cast(source), reinterpret_cast(compressed.data()), + source_size_int, static_cast(max_compressed_size)); if (compressed_size <= 0) { // Compression failed return {}; } - compressed.resize(compressed_size); + compressed.resize(static_cast(compressed_size)); return compressed; } -std::vector CompressDataLZ4HC(std::span source, s32 compression_level) { - ASSERT_MSG(source.size() <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); +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"); compression_level = std::clamp(compression_level, LZ4HC_CLEVEL_MIN, LZ4HC_CLEVEL_MAX); - const auto source_size_int = static_cast(source.size()); - const int max_compressed_size = LZ4_compressBound(source_size_int); + const auto source_size_int = static_cast(source_size); + const auto max_compressed_size = static_cast(LZ4_compressBound(source_size_int)); std::vector compressed(max_compressed_size); const int compressed_size = LZ4_compress_HC( - reinterpret_cast(source.data()), reinterpret_cast(compressed.data()), - source_size_int, max_compressed_size, compression_level); + reinterpret_cast(source), reinterpret_cast(compressed.data()), + source_size_int, static_cast(max_compressed_size), compression_level); if (compressed_size <= 0) { // Compression failed return {}; } - compressed.resize(compressed_size); + compressed.resize(static_cast(compressed_size)); return compressed; } -std::vector CompressDataLZ4HCMax(std::span source) { - return CompressDataLZ4HC(source, LZ4HC_CLEVEL_MAX); +std::vector CompressDataLZ4HCMax(const u8* source, std::size_t source_size) { + return CompressDataLZ4HC(source, source_size, 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 088ff5c917..87a4be1b0e 100644 --- a/src/common/lz4_compression.h +++ b/src/common/lz4_compression.h @@ -4,7 +4,6 @@ #pragma once -#include #include #include "common/common_types.h" @@ -14,11 +13,12 @@ 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 The uncompressed source memory region. + * @param source_size The size of the uncompressed source memory region. * * @return the compressed data. */ -[[nodiscard]] std::vector CompressDataLZ4(std::span source); +[[nodiscard]] std::vector CompressDataLZ4(const u8* source, std::size_t source_size); /** * Utilizes the LZ4 subalgorithm LZ4HC with the specified compression level. Higher compression @@ -26,21 +26,24 @@ namespace Common::Compression { * compression level has almost no impact on decompression speed. Data compressed with LZ4HC can * also be decompressed with the default LZ4 decompression. * - * @param source the uncompressed source memory region. - * @param compression_level the used compression level. Should be between 3 and 12. + * @param source The uncompressed source memory region. + * @param source_size The size of the uncompressed source memory region. + * @param compression_level The used compression level. Should be between 3 and 12. * * @return the compressed data. */ -[[nodiscard]] std::vector CompressDataLZ4HC(std::span source, s32 compression_level); +[[nodiscard]] std::vector CompressDataLZ4HC(const u8* source, std::size_t source_size, + s32 compression_level); /** * Utilizes the LZ4 subalgorithm LZ4HC with the highest possible compression level. * - * @param source the uncompressed source memory region. + * @param source The uncompressed source memory region. + * @param source_size The size of the uncompressed source memory region * * @return the compressed data. */ -[[nodiscard]] std::vector CompressDataLZ4HCMax(std::span source); +[[nodiscard]] std::vector CompressDataLZ4HCMax(const u8* source, std::size_t source_size); /** * Decompresses a source memory region with LZ4 and returns the uncompressed data in a vector. diff --git a/src/common/zstd_compression.cpp b/src/common/zstd_compression.cpp index 770833ee79..5f45459da0 100644 --- a/src/common/zstd_compression.cpp +++ b/src/common/zstd_compression.cpp @@ -9,14 +9,14 @@ namespace Common::Compression { -std::vector CompressDataZSTD(std::span source, s32 compression_level) { +std::vector CompressDataZSTD(const u8* source, std::size_t source_size, 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.data(), source.size(), compression_level); + const std::size_t compressed_size = + ZSTD_compress(compressed.data(), compressed.size(), source, source_size, compression_level); if (ZSTD_isError(compressed_size)) { // Compression failed @@ -28,8 +28,8 @@ std::vector CompressDataZSTD(std::span source, s32 compression_lev return compressed; } -std::vector CompressDataZSTDDefault(std::span source) { - return CompressDataZSTD(source, ZSTD_CLEVEL_DEFAULT); +std::vector CompressDataZSTDDefault(const u8* source, std::size_t source_size) { + return CompressDataZSTD(source, source_size, 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 4bacf8355a..c26a30ab9d 100644 --- a/src/common/zstd_compression.h +++ b/src/common/zstd_compression.h @@ -4,7 +4,6 @@ #pragma once -#include #include #include "common/common_types.h" @@ -14,22 +13,25 @@ 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 compression_level the used compression level. Should be between 1 and 22. + * @param source The uncompressed source memory region. + * @param source_size The size of the uncompressed source memory region. + * @param compression_level The used compression level. Should be between 1 and 22. * * @return the compressed data. */ -[[nodiscard]] std::vector CompressDataZSTD(std::span source, s32 compression_level); +[[nodiscard]] std::vector CompressDataZSTD(const u8* source, std::size_t source_size, + 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 The uncompressed source memory region. + * @param source_size The size of the uncompressed source memory region. * * @return the compressed data. */ -[[nodiscard]] std::vector CompressDataZSTDDefault(std::span source); +[[nodiscard]] std::vector CompressDataZSTDDefault(const u8* source, std::size_t source_size); /** * 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 c0e73789b8..2dcc2b0eba 100644 --- a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp @@ -422,7 +422,8 @@ 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); + const std::vector compressed = + Common::Compression::CompressDataZSTDDefault(uncompressed.data(), uncompressed.size()); const auto precompiled_path{GetPrecompiledPath()}; FileUtil::IOFile file(precompiled_path, "wb");