From d3d635b64fe7042ffda0152c44a526aabb1ee2a5 Mon Sep 17 00:00:00 2001 From: AxiomaticSemantics Date: Sun, 25 Dec 2022 00:23:14 +0000 Subject: [PATCH] Constify SpritePipelineKey implementation. (#6976) # Objective - Describe the objective or issue this PR addresses. SpritePipelineKey could use more constification. ## Solution Constify SpritePipelineKey implementation. ## Changelog Co-authored-by: AxiomaticSemantics <117950168+AxiomaticSemantics@users.noreply.github.com> --- crates/bevy_sprite/src/render/mod.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/crates/bevy_sprite/src/render/mod.rs b/crates/bevy_sprite/src/render/mod.rs index 1cdc6d9378..765679b09b 100644 --- a/crates/bevy_sprite/src/render/mod.rs +++ b/crates/bevy_sprite/src/render/mod.rs @@ -160,17 +160,20 @@ impl SpritePipelineKey { const MSAA_MASK_BITS: u32 = 0b111; const MSAA_SHIFT_BITS: u32 = 32 - Self::MSAA_MASK_BITS.count_ones(); - pub fn from_msaa_samples(msaa_samples: u32) -> Self { + #[inline] + pub const fn from_msaa_samples(msaa_samples: u32) -> Self { let msaa_bits = (msaa_samples.trailing_zeros() & Self::MSAA_MASK_BITS) << Self::MSAA_SHIFT_BITS; - Self::from_bits(msaa_bits).unwrap() + Self::from_bits_truncate(msaa_bits) } - pub fn msaa_samples(&self) -> u32 { + #[inline] + pub const fn msaa_samples(&self) -> u32 { 1 << ((self.bits >> Self::MSAA_SHIFT_BITS) & Self::MSAA_MASK_BITS) } - pub fn from_colored(colored: bool) -> Self { + #[inline] + pub const fn from_colored(colored: bool) -> Self { if colored { SpritePipelineKey::COLORED } else { @@ -178,7 +181,8 @@ impl SpritePipelineKey { } } - pub fn from_hdr(hdr: bool) -> Self { + #[inline] + pub const fn from_hdr(hdr: bool) -> Self { if hdr { SpritePipelineKey::HDR } else {