summaryrefslogtreecommitdiffstats
path: root/src/video_core/texture_cache
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-07-14 20:04:16 +0200
committerGitHub <noreply@github.com>2020-07-14 20:04:16 +0200
commit666b37ad56e816cd2bde4a521cba0e63812dc681 (patch)
treec498f364e42006df041ec4bab818edb2c1b23d36 /src/video_core/texture_cache
parentMerge pull request #4294 from MerryMage/cpu-opt-settings (diff)
parentvideo_core/textures: Add and use SwizzleSliceToVoxel, and minor style changes (diff)
downloadyuzu-666b37ad56e816cd2bde4a521cba0e63812dc681.tar
yuzu-666b37ad56e816cd2bde4a521cba0e63812dc681.tar.gz
yuzu-666b37ad56e816cd2bde4a521cba0e63812dc681.tar.bz2
yuzu-666b37ad56e816cd2bde4a521cba0e63812dc681.tar.lz
yuzu-666b37ad56e816cd2bde4a521cba0e63812dc681.tar.xz
yuzu-666b37ad56e816cd2bde4a521cba0e63812dc681.tar.zst
yuzu-666b37ad56e816cd2bde4a521cba0e63812dc681.zip
Diffstat (limited to 'src/video_core/texture_cache')
-rw-r--r--src/video_core/texture_cache/surface_params.cpp5
-rw-r--r--src/video_core/texture_cache/surface_params.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/video_core/texture_cache/surface_params.cpp b/src/video_core/texture_cache/surface_params.cpp
index 0b2b2b8c4..921562c1f 100644
--- a/src/video_core/texture_cache/surface_params.cpp
+++ b/src/video_core/texture_cache/surface_params.cpp
@@ -343,8 +343,7 @@ std::size_t SurfaceParams::GetLayerSize(bool as_host_size, bool uncompressed) co
size += GetInnerMipmapMemorySize(level, as_host_size, uncompressed);
}
if (is_tiled && is_layered) {
- return Common::AlignBits(size,
- Tegra::Texture::GetGOBSizeShift() + block_height + block_depth);
+ return Common::AlignBits(size, Tegra::Texture::GOB_SIZE_SHIFT + block_height + block_depth);
}
return size;
}
@@ -418,7 +417,7 @@ std::tuple<u32, u32, u32> SurfaceParams::GetBlockOffsetXYZ(u32 offset) const {
const u32 block_size = GetBlockSize();
const u32 block_index = offset / block_size;
const u32 gob_offset = offset % block_size;
- const u32 gob_index = gob_offset / static_cast<u32>(Tegra::Texture::GetGOBSize());
+ const u32 gob_index = gob_offset / static_cast<u32>(Tegra::Texture::GOB_SIZE);
const u32 x_gob_pixels = 64U / GetBytesPerPixel();
const u32 x_block_pixels = x_gob_pixels << block_width;
const u32 y_block_pixels = 8U << block_height;
diff --git a/src/video_core/texture_cache/surface_params.h b/src/video_core/texture_cache/surface_params.h
index 24957df8d..118aa689e 100644
--- a/src/video_core/texture_cache/surface_params.h
+++ b/src/video_core/texture_cache/surface_params.h
@@ -204,7 +204,7 @@ public:
static std::size_t AlignLayered(const std::size_t out_size, const u32 block_height,
const u32 block_depth) {
return Common::AlignBits(out_size,
- Tegra::Texture::GetGOBSizeShift() + block_height + block_depth);
+ Tegra::Texture::GOB_SIZE_SHIFT + block_height + block_depth);
}
/// Converts a width from a type of surface into another. This helps represent the