aboutsummaryrefslogtreecommitdiff
path: root/src/video_core/texture_cache/accelerated_swizzle.cpp
diff options
context:
space:
mode:
authorLC <mathew1800@gmail.com>2021-01-15 03:12:36 -0500
committerGitHub <noreply@github.com>2021-01-15 03:12:36 -0500
commit9754a8145c621f010a4a1f68ee1b469b3a438ab9 (patch)
tree7d86584cbbfa5e7ce1790fc94bb39b1985e13d3c /src/video_core/texture_cache/accelerated_swizzle.cpp
parent5b9aedfc215e2f7227a8604d2d28fb462949d537 (diff)
parent89c15dd115d136bbfc20aeddef87ed2d87972e77 (diff)
Merge pull request #5357 from ReinUsesLisp/alignment-log2
common/alignment: Rename AlignBits to AlignUpLog2 and use constraints
Diffstat (limited to 'src/video_core/texture_cache/accelerated_swizzle.cpp')
-rw-r--r--src/video_core/texture_cache/accelerated_swizzle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/texture_cache/accelerated_swizzle.cpp b/src/video_core/texture_cache/accelerated_swizzle.cpp
index a4fc1184b..15585caeb 100644
--- a/src/video_core/texture_cache/accelerated_swizzle.cpp
+++ b/src/video_core/texture_cache/accelerated_swizzle.cpp
@@ -27,7 +27,7 @@ BlockLinearSwizzle2DParams MakeBlockLinearSwizzle2DParams(const SwizzleParameter
const Extent3D num_tiles = swizzle.num_tiles;
const u32 bytes_per_block = BytesPerBlock(info.format);
const u32 stride_alignment = CalculateLevelStrideAlignment(info, swizzle.level);
- const u32 stride = Common::AlignBits(num_tiles.width, stride_alignment) * bytes_per_block;
+ const u32 stride = Common::AlignUpLog2(num_tiles.width, stride_alignment) * bytes_per_block;
const u32 gobs_in_x = Common::DivCeilLog2(stride, GOB_SIZE_X_SHIFT);
return BlockLinearSwizzle2DParams{
.origin{0, 0, 0},
@@ -47,7 +47,7 @@ BlockLinearSwizzle3DParams MakeBlockLinearSwizzle3DParams(const SwizzleParameter
const Extent3D num_tiles = swizzle.num_tiles;
const u32 bytes_per_block = BytesPerBlock(info.format);
const u32 stride_alignment = CalculateLevelStrideAlignment(info, swizzle.level);
- const u32 stride = Common::AlignBits(num_tiles.width, stride_alignment) * bytes_per_block;
+ const u32 stride = Common::AlignUpLog2(num_tiles.width, stride_alignment) * bytes_per_block;
const u32 gobs_in_x = (stride + GOB_SIZE_X - 1) >> GOB_SIZE_X_SHIFT;
const u32 block_size = gobs_in_x << (GOB_SIZE_SHIFT + block.height + block.depth);