diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-20 10:47:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-20 10:47:29 +0100 |
| commit | a74e2c50583d839a8066f5ee2f806a11137a7026 (patch) | |
| tree | faa6804b079c6165af3fd33962731aae62491921 /thirdparty/basis_universal/transcoder/basisu_transcoder.cpp | |
| parent | bf18965a5103694bdc53cd21cc0132f69de87549 (diff) | |
| parent | 2c22caccc55b2e827e3e3b2e36d308de352114d1 (diff) | |
| download | redot-engine-a74e2c50583d839a8066f5ee2f806a11137a7026.tar.gz | |
Merge pull request #55136 from akien-mga/basisu-646a9f826
Diffstat (limited to 'thirdparty/basis_universal/transcoder/basisu_transcoder.cpp')
| -rw-r--r-- | thirdparty/basis_universal/transcoder/basisu_transcoder.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/thirdparty/basis_universal/transcoder/basisu_transcoder.cpp b/thirdparty/basis_universal/transcoder/basisu_transcoder.cpp index 29eb3c0d55..0b3733385d 100644 --- a/thirdparty/basis_universal/transcoder/basisu_transcoder.cpp +++ b/thirdparty/basis_universal/transcoder/basisu_transcoder.cpp @@ -10778,8 +10778,6 @@ namespace basist return false; } - const bool transcode_alpha_data_to_opaque_formats = (decode_flags & cDecodeFlagsTranscodeAlphaDataToOpaqueFormats) != 0; - if (decode_flags & cDecodeFlagsPVRTCDecodeToNextPow2) { BASISU_DEVEL_ERROR("basisu_transcoder::transcode_image_level: cDecodeFlagsPVRTCDecodeToNextPow2 currently unsupported\n"); @@ -17336,7 +17334,6 @@ namespace basist bool ktx2_transcoder::decompress_level_data(uint32_t level_index, basisu::uint8_vec& uncomp_data) { - const uint8_t* pComp_data = m_levels[level_index].m_byte_offset + m_pData; const uint64_t comp_size = m_levels[level_index].m_byte_length; const uint64_t uncomp_size = m_levels[level_index].m_uncompressed_byte_length; @@ -17361,6 +17358,7 @@ namespace basist if (m_header.m_supercompression_scheme == KTX2_SS_ZSTANDARD) { #if BASISD_SUPPORT_KTX2_ZSTD + const uint8_t* pComp_data = m_levels[level_index].m_byte_offset + m_pData; size_t actualUncompSize = ZSTD_decompress(uncomp_data.data(), (size_t)uncomp_size, pComp_data, (size_t)comp_size); if (ZSTD_isError(actualUncompSize)) { |