diff options
| author |  ReinUsesLisp | 2021-01-09 03:14:18 -0300 |
|---|---|---|
| committer | ReinUsesLisp | 2021-01-09 03:16:10 -0300 |
| commit | c19058659770fe4b235859aa4c617ae56947051d (patch) | |
| tree | d662eb78fd10b4da3ef49657251afb37a686ad02 | |
| parent | Merge pull request #5231 from ReinUsesLisp/dyn-bindings (diff) | |
| download | yuzu-c19058659770fe4b235859aa4c617ae56947051d.tar.gz yuzu-c19058659770fe4b235859aa4c617ae56947051d.tar.xz yuzu-c19058659770fe4b235859aa4c617ae56947051d.zip | |
common/div_ceil: Return numerator type
Fixes instances where DivCeil(u32, u64) would surprisingly return u64,
instead of the more natural u32.
Diffstat (limited to '')
| -rw-r--r-- | src/common/div_ceil.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/div_ceil.h b/src/common/div_ceil.h index 6b2c48f91..95e1489a9 100644 --- a/src/common/div_ceil.h +++ b/src/common/div_ceil.h | |||
| @@ -11,16 +11,16 @@ namespace Common { | |||
| 11 | 11 | ||
| 12 | /// Ceiled integer division. | 12 | /// Ceiled integer division. |
| 13 | template <typename N, typename D> | 13 | template <typename N, typename D> |
| 14 | requires std::is_integral_v<N>&& std::is_unsigned_v<D>[[nodiscard]] constexpr auto DivCeil( | 14 | requires std::is_integral_v<N>&& std::is_unsigned_v<D>[[nodiscard]] constexpr N DivCeil(N number, |
| 15 | N number, D divisor) { | 15 | D divisor) { |
| 16 | return (static_cast<D>(number) + divisor - 1) / divisor; | 16 | return static_cast<N>((static_cast<D>(number) + divisor - 1) / divisor); |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | /// Ceiled integer division with logarithmic divisor in base 2 | 19 | /// Ceiled integer division with logarithmic divisor in base 2 |
| 20 | template <typename N, typename D> | 20 | template <typename N, typename D> |
| 21 | requires std::is_integral_v<N>&& std::is_unsigned_v<D>[[nodiscard]] constexpr auto DivCeilLog2( | 21 | requires std::is_integral_v<N>&& std::is_unsigned_v<D>[[nodiscard]] constexpr N DivCeilLog2( |
| 22 | N value, D alignment_log2) { | 22 | N value, D alignment_log2) { |
| 23 | return (static_cast<D>(value) + (D(1) << alignment_log2) - 1) >> alignment_log2; | 23 | return static_cast<N>((static_cast<D>(value) + (D(1) << alignment_log2) - 1) >> alignment_log2); |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | } // namespace Common | 26 | } // namespace Common |