summaryrefslogtreecommitdiffstats
path: root/src/video_core/textures/astc.h
diff options
context:
space:
mode:
authorameerj <52414509+ameerj@users.noreply.github.com>2021-06-19 16:56:13 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-06-19 16:56:13 +0200
commitace20ba4a4774ae3c42f2ef5566c7113f3b980b3 (patch)
tree088a7d63269fcd65e84d465cc2c821662674cffc /src/video_core/textures/astc.h
parentastc: Various robustness enhancements for the gpu decoder (diff)
downloadyuzu-ace20ba4a4774ae3c42f2ef5566c7113f3b980b3.tar
yuzu-ace20ba4a4774ae3c42f2ef5566c7113f3b980b3.tar.gz
yuzu-ace20ba4a4774ae3c42f2ef5566c7113f3b980b3.tar.bz2
yuzu-ace20ba4a4774ae3c42f2ef5566c7113f3b980b3.tar.lz
yuzu-ace20ba4a4774ae3c42f2ef5566c7113f3b980b3.tar.xz
yuzu-ace20ba4a4774ae3c42f2ef5566c7113f3b980b3.tar.zst
yuzu-ace20ba4a4774ae3c42f2ef5566c7113f3b980b3.zip
Diffstat (limited to '')
-rw-r--r--src/video_core/textures/astc.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/video_core/textures/astc.h b/src/video_core/textures/astc.h
index 441e8eb04..0229ae122 100644
--- a/src/video_core/textures/astc.h
+++ b/src/video_core/textures/astc.h
@@ -77,7 +77,7 @@ constexpr std::array<IntegerEncodedValue, 256> MakeEncodedValues() {
return encodings;
}
-constexpr std::array<IntegerEncodedValue, 256> EncodingsValues = MakeEncodedValues();
+constexpr std::array<IntegerEncodedValue, 256> ASTC_ENCODINGS_VALUES = MakeEncodedValues();
// Replicates low num_bits such that [(to_bit - 1):(to_bit - 1 - from_bit)]
// is the same as [(num_bits - 1):0] and repeats all the way down.
@@ -120,13 +120,6 @@ constexpr auto REPLICATE_6_BIT_TO_8_TABLE = MakeReplicateTable<u32, 6, 8>();
constexpr auto REPLICATE_7_BIT_TO_8_TABLE = MakeReplicateTable<u32, 7, 8>();
constexpr auto REPLICATE_8_BIT_TO_8_TABLE = MakeReplicateTable<u32, 8, 8>();
-struct AstcBufferData {
- decltype(EncodingsValues) encoding_values = EncodingsValues;
- decltype(REPLICATE_6_BIT_TO_8_TABLE) replicate_6_to_8 = REPLICATE_6_BIT_TO_8_TABLE;
- decltype(REPLICATE_7_BIT_TO_8_TABLE) replicate_7_to_8 = REPLICATE_7_BIT_TO_8_TABLE;
- decltype(REPLICATE_8_BIT_TO_8_TABLE) replicate_8_to_8 = REPLICATE_8_BIT_TO_8_TABLE;
-} constexpr ASTC_BUFFER_DATA;
-
void Decompress(std::span<const uint8_t> data, uint32_t width, uint32_t height, uint32_t depth,
uint32_t block_width, uint32_t block_height, std::span<uint8_t> output);