From 835a3d09c67eb5a028e5594f64490135b7b423a4 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Fri, 13 Mar 2020 22:26:48 -0300 Subject: astc: Move Popcnt to an anonymous namespace and make it constexpr --- src/video_core/textures/astc.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'src/video_core/textures') diff --git a/src/video_core/textures/astc.cpp b/src/video_core/textures/astc.cpp index dcfab4dad..aba47a0e8 100644 --- a/src/video_core/textures/astc.cpp +++ b/src/video_core/textures/astc.cpp @@ -25,6 +25,19 @@ #include "video_core/textures/astc.h" +namespace { + +/// Count the number of bits set in a number. +constexpr u32 Popcnt(u32 n) { + u32 c = 0; + for (; n; c++) { + n &= n - 1; + } + return c; +} + +} // Anonymous namespace + class InputBitStream { public: explicit InputBitStream(const unsigned char* ptr, int start_offset = 0) @@ -212,15 +225,6 @@ public: return totalBits; } - // Count the number of bits set in a number. - static inline u32 Popcnt(u32 n) { - u32 c; - for (c = 0; n; c++) { - n &= n - 1; - } - return c; - } - // Returns a new instance of this struct that corresponds to the // can take no more than maxval values static IntegerEncodedValue CreateEncoding(u32 maxVal) { -- cgit v1.2.3