[Bf-blender-cvs] [8095aad47e2] master: Cycles: Fix build error on windows

[Ray Molenkamp]

Commit: 8095aad47e2c0f2ae67be67b362964ba1c892369
Author: Ray Molenkamp
Date:   Wed Feb 17 10:21:00 2021 -0700
Branches: master
https://developer.blender.org/rB8095aad47e2c0f2ae67be67b362964ba1c892369

Cycles: Fix build error on windows

Function __bsf was in util/util_simd.h twice

problem located by @EAW on chat.

===================================================================

M	intern/cycles/util/util_simd.h

===================================================================

diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h
index c51c3c957e0..d327b7298dc 100644
--- a/intern/cycles/util/util_simd.h
+++ b/intern/cycles/util/util_simd.h
@@ -224,17 +224,6 @@ __forceinline uint32_t __bsf(uint32_t v)
 #  endif
 }
 
-__forceinline uint32_t __bsf(uint32_t v)
-{
-#  if defined(__KERNEL_AVX2__)
-  return _tzcnt_u32(v);
-#  else
-  unsigned long r = 0;
-  _BitScanForward(&r, v);
-  return r;
-#  endif
-}
-
 __forceinline uint32_t __bsr(uint32_t v)
 {
   unsigned long r = 0;