summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-05-01 03:45:49 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-05-01 05:02:31 +0200
commit95261639fb4ed67ecf1cb84dd7a8e380788bd420 (patch)
tree0232f10959c0cbff0a6fc15e4256068ea1d9b3a0 /src/video_core
parentMerge pull request #2406 from FearlessTobi/port-3839 (diff)
downloadyuzu-95261639fb4ed67ecf1cb84dd7a8e380788bd420.tar
yuzu-95261639fb4ed67ecf1cb84dd7a8e380788bd420.tar.gz
yuzu-95261639fb4ed67ecf1cb84dd7a8e380788bd420.tar.bz2
yuzu-95261639fb4ed67ecf1cb84dd7a8e380788bd420.tar.lz
yuzu-95261639fb4ed67ecf1cb84dd7a8e380788bd420.tar.xz
yuzu-95261639fb4ed67ecf1cb84dd7a8e380788bd420.tar.zst
yuzu-95261639fb4ed67ecf1cb84dd7a8e380788bd420.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/textures/astc.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/video_core/textures/astc.cpp b/src/video_core/textures/astc.cpp
index b508d64e9..eafb6b73a 100644
--- a/src/video_core/textures/astc.cpp
+++ b/src/video_core/textures/astc.cpp
@@ -1616,6 +1616,7 @@ namespace Tegra::Texture::ASTC {
std::vector<uint8_t> Decompress(const uint8_t* data, uint32_t width, uint32_t height,
uint32_t depth, uint32_t block_width, uint32_t block_height) {
uint32_t blockIdx = 0;
+ std::size_t depth_offset = 0;
std::vector<uint8_t> outData(height * width * depth * 4);
for (uint32_t k = 0; k < depth; k++) {
for (uint32_t j = 0; j < height; j += block_height) {
@@ -1630,7 +1631,7 @@ std::vector<uint8_t> Decompress(const uint8_t* data, uint32_t width, uint32_t he
uint32_t decompWidth = std::min(block_width, width - i);
uint32_t decompHeight = std::min(block_height, height - j);
- uint8_t* outRow = outData.data() + (j * width + i) * 4;
+ uint8_t* outRow = depth_offset + outData.data() + (j * width + i) * 4;
for (uint32_t jj = 0; jj < decompHeight; jj++) {
memcpy(outRow + jj * width * 4, uncompData + jj * block_width, decompWidth * 4);
}
@@ -1638,6 +1639,7 @@ std::vector<uint8_t> Decompress(const uint8_t* data, uint32_t width, uint32_t he
blockIdx++;
}
}
+ depth_offset += height * width * 4;
}
return outData;