summaryrefslogtreecommitdiffstats
path: root/src/video_core/textures
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-10-25 06:29:18 +0200
committerGitHub <noreply@github.com>2018-10-25 06:29:18 +0200
commitf7a173de6c574a5117bfe70df3635247ae28edb0 (patch)
tree5f00562a0143fdca73c0c2bec0daaf62b4d15cad /src/video_core/textures
parentMerge pull request #1575 from lioncash/qstring (diff)
parentFixed Layered Textures Loading and Cubemaps (diff)
downloadyuzu-f7a173de6c574a5117bfe70df3635247ae28edb0.tar
yuzu-f7a173de6c574a5117bfe70df3635247ae28edb0.tar.gz
yuzu-f7a173de6c574a5117bfe70df3635247ae28edb0.tar.bz2
yuzu-f7a173de6c574a5117bfe70df3635247ae28edb0.tar.lz
yuzu-f7a173de6c574a5117bfe70df3635247ae28edb0.tar.xz
yuzu-f7a173de6c574a5117bfe70df3635247ae28edb0.tar.zst
yuzu-f7a173de6c574a5117bfe70df3635247ae28edb0.zip
Diffstat (limited to 'src/video_core/textures')
-rw-r--r--src/video_core/textures/decoders.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/textures/decoders.cpp b/src/video_core/textures/decoders.cpp
index da7989db9..550ca856c 100644
--- a/src/video_core/textures/decoders.cpp
+++ b/src/video_core/textures/decoders.cpp
@@ -319,13 +319,13 @@ std::vector<u8> DecodeTexture(const std::vector<u8>& texture_data, TextureFormat
std::size_t CalculateSize(bool tiled, u32 bytes_per_pixel, u32 width, u32 height, u32 depth,
u32 block_height, u32 block_depth) {
if (tiled) {
- const u32 gobs_in_x = 64 / bytes_per_pixel;
+ const u32 gobs_in_x = 64;
const u32 gobs_in_y = 8;
const u32 gobs_in_z = 1;
- const u32 aligned_width = Common::AlignUp(width, gobs_in_x);
+ const u32 aligned_width = Common::AlignUp(width * bytes_per_pixel, gobs_in_x);
const u32 aligned_height = Common::AlignUp(height, gobs_in_y * block_height);
const u32 aligned_depth = Common::AlignUp(depth, gobs_in_z * block_depth);
- return aligned_width * aligned_height * aligned_depth * bytes_per_pixel;
+ return aligned_width * aligned_height * aligned_depth;
} else {
return width * height * depth * bytes_per_pixel;
}