summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-04-16 18:00:46 +0200
committerFernando Sahmkow <fsahmkow27@gmail.com>2019-04-16 18:00:46 +0200
commitda91e6e4b6aabe13f7b748930de8afa28d10aa6c (patch)
tree8993c0ad56415b7e8a2df007d30db67fff12fa9f
parentUse WriteBlock and ReadBlock. (diff)
downloadyuzu-da91e6e4b6aabe13f7b748930de8afa28d10aa6c.tar
yuzu-da91e6e4b6aabe13f7b748930de8afa28d10aa6c.tar.gz
yuzu-da91e6e4b6aabe13f7b748930de8afa28d10aa6c.tar.bz2
yuzu-da91e6e4b6aabe13f7b748930de8afa28d10aa6c.tar.lz
yuzu-da91e6e4b6aabe13f7b748930de8afa28d10aa6c.tar.xz
yuzu-da91e6e4b6aabe13f7b748930de8afa28d10aa6c.tar.zst
yuzu-da91e6e4b6aabe13f7b748930de8afa28d10aa6c.zip
-rw-r--r--src/video_core/textures/decoders.cpp16
-rw-r--r--src/video_core/textures/decoders.h5
2 files changed, 12 insertions, 9 deletions
diff --git a/src/video_core/textures/decoders.cpp b/src/video_core/textures/decoders.cpp
index 6e02a6407..217805386 100644
--- a/src/video_core/textures/decoders.cpp
+++ b/src/video_core/textures/decoders.cpp
@@ -288,18 +288,20 @@ void UnswizzleSubrect(u32 subrect_width, u32 subrect_height, u32 dest_pitch, u32
}
}
-void SwizzleKepler(u32 width, u32 height, u32 dst_x, u32 dst_y, u32 block_height,
- std::size_t copy_size, u8* source_data, u8* swizzle_data) {
+void SwizzleKepler(const u32 width, const u32 height, const u32 dst_x, const u32 dst_y,
+ const u32 block_height, const std::size_t copy_size, const u8* source_data,
+ u8* swizzle_data) {
const u32 image_width_in_gobs{(width + gob_size_x - 1) / gob_size_x};
std::size_t count = 0;
- for (u32 y = dst_y; y < height && count < copy_size; ++y) {
- const u32 gob_address_y =
+ for (std::size_t y = dst_y; y < height && count < copy_size; ++y) {
+ const std::size_t gob_address_y =
(y / (gob_size_y * block_height)) * gob_size * block_height * image_width_in_gobs +
((y % (gob_size_y * block_height)) / gob_size_y) * gob_size;
const auto& table = legacy_swizzle_table[y % gob_size_y];
- for (u32 x = dst_x; x < width && count < copy_size; ++x) {
- const u32 gob_address = gob_address_y + (x / gob_size_x) * gob_size * block_height;
- const u32 swizzled_offset = gob_address + table[x % gob_size_x];
+ for (std::size_t x = dst_x; x < width && count < copy_size; ++x) {
+ const std::size_t gob_address =
+ gob_address_y + (x / gob_size_x) * gob_size * block_height;
+ const std::size_t swizzled_offset = gob_address + table[x % gob_size_x];
const u8* source_line = source_data + count;
u8* dest_addr = swizzle_data + swizzled_offset;
count++;
diff --git a/src/video_core/textures/decoders.h b/src/video_core/textures/decoders.h
index 21d4b37fc..e072d8401 100644
--- a/src/video_core/textures/decoders.h
+++ b/src/video_core/textures/decoders.h
@@ -51,7 +51,8 @@ void UnswizzleSubrect(u32 subrect_width, u32 subrect_height, u32 dest_pitch, u32
u32 bytes_per_pixel, u8* swizzled_data, u8* unswizzled_data, u32 block_height,
u32 offset_x, u32 offset_y);
-void SwizzleKepler(u32 width, u32 height, u32 dst_x, u32 dst_y, u32 block_height,
- std::size_t copy_size, u8* source_data, u8* swizzle_data);
+void SwizzleKepler(const u32 width, const u32 height, const u32 dst_x, const u32 dst_y,
+ const u32 block_height, const std::size_t copy_size, const u8* source_data,
+ u8* swizzle_data);
} // namespace Tegra::Texture