[Bf-blender-cvs] [6560a1c35e2] master: Math Utils: Add bitscan 64bit version
Clément Foucault
noreply at git.blender.org
Sat Sep 5 17:50:10 CEST 2020
Commit: 6560a1c35e2398fb3f3460c62e683062c3d08f06
Author: Clément Foucault
Date: Sat Sep 5 17:37:05 2020 +0200
Branches: master
https://developer.blender.org/rB6560a1c35e2398fb3f3460c62e683062c3d08f06
Math Utils: Add bitscan 64bit version
===================================================================
M source/blender/blenlib/BLI_math_bits.h
M source/blender/blenlib/intern/math_bits_inline.c
===================================================================
diff --git a/source/blender/blenlib/BLI_math_bits.h b/source/blender/blenlib/BLI_math_bits.h
index b602900bedc..b007dd7cfed 100644
--- a/source/blender/blenlib/BLI_math_bits.h
+++ b/source/blender/blenlib/BLI_math_bits.h
@@ -31,6 +31,7 @@ extern "C" {
/* Search the value from LSB to MSB for a set bit. Returns index of this bit. */
MINLINE int bitscan_forward_i(int a);
MINLINE unsigned int bitscan_forward_uint(unsigned int a);
+MINLINE unsigned int bitscan_forward_uint64(unsigned long long a);
/* Similar to above, but also clears the bit. */
MINLINE int bitscan_forward_clear_i(int *a);
@@ -39,6 +40,7 @@ MINLINE unsigned int bitscan_forward_clear_uint(unsigned int *a);
/* Search the value from MSB to LSB for a set bit. Returns index of this bit. */
MINLINE int bitscan_reverse_i(int a);
MINLINE unsigned int bitscan_reverse_uint(unsigned int a);
+MINLINE unsigned int bitscan_reverse_uint64(unsigned long long a);
/* Similar to above, but also clears the bit. */
MINLINE int bitscan_reverse_clear_i(int *a);
diff --git a/source/blender/blenlib/intern/math_bits_inline.c b/source/blender/blenlib/intern/math_bits_inline.c
index e7a7b17e1e4..3a0cea182ba 100644
--- a/source/blender/blenlib/intern/math_bits_inline.c
+++ b/source/blender/blenlib/intern/math_bits_inline.c
@@ -40,6 +40,18 @@ MINLINE unsigned int bitscan_forward_uint(unsigned int a)
#endif
}
+MINLINE unsigned int bitscan_forward_uint64(unsigned long long a)
+{
+ BLI_assert(a != 0);
+#ifdef _MSC_VER
+ unsigned long ctz;
+ _BitScanForward64(&ctz, a);
+ return ctz;
+#else
+ return (unsigned int)__builtin_ctz(a);
+#endif
+}
+
MINLINE int bitscan_forward_i(int a)
{
return (int)bitscan_forward_uint((unsigned int)a);
@@ -69,6 +81,18 @@ MINLINE unsigned int bitscan_reverse_uint(unsigned int a)
#endif
}
+MINLINE unsigned int bitscan_reverse_uint64(unsigned long long a)
+{
+ BLI_assert(a != 0);
+#ifdef _MSC_VER
+ unsigned long clz;
+ _BitScanReverse64(&clz, a);
+ return 31 - clz;
+#else
+ return (unsigned int)__builtin_clzll(a);
+#endif
+}
+
MINLINE int bitscan_reverse_i(int a)
{
return (int)bitscan_reverse_uint((unsigned int)a);
More information about the Bf-blender-cvs
mailing list