[ros-diffs] [reactos] 192/218: [WINESYNC] d3dx9: Use BitScanReverse in make_pow2.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbb79195a5f996538da26…

commit bbb79195a5f996538da26c0d56a28523055c1613
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 23:07:38 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:06 2021 +0100

    [WINESYNC] d3dx9: Use BitScanReverse in make_pow2.
    
    Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 22970932d014f024fcf7f0f98b1a5384b1b1eb99 by Jacek Caban
<jacek(a)codeweavers.com>
---
 dll/directx/wine/d3dx9_36/d3dx9_private.h | 15 ++++-----------
 sdk/tools/winesync/d3dx9.cfg              |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/d3dx9_private.h
b/dll/directx/wine/d3dx9_36/d3dx9_private.h
index 92116b163f2..66c93d26e84 100644
--- a/dll/directx/wine/d3dx9_36/d3dx9_private.h
+++ b/dll/directx/wine/d3dx9_36/d3dx9_private.h
@@ -229,19 +229,12 @@ static inline BOOL is_param_type_sampler(D3DXPARAMETER_TYPE type)
 /* Returns the smallest power of 2 which is greater than or equal to num */
 static inline uint32_t make_pow2(uint32_t num)
 {
-#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) &&
(__GNUC_MINOR__ >= 3)))
-    return num == 1 ? 1 : 1u << ((__builtin_clz(num - 1) ^ 0x1f) + 1);
+#ifndef __REACTOS__
+    uint32_t index;
 #else
-    num--;
-    num |= num >> 1;
-    num |= num >> 2;
-    num |= num >> 4;
-    num |= num >> 8;
-    num |= num >> 16;
-    num++;
-
-    return num;
+    unsigned long index;
 #endif
+    return BitScanReverse(&index, num - 1) ? 1u << (index + 1) : 1;
 }
 
 struct d3dx_parameter;
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 385ddb20490..868488fe995 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h:
sdk/inc
   include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h:
sdk/include/dxsdk/d3dx9of.h,
   include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h:
sdk/include/dxsdk/d3dx9shape.h,
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h:
sdk/include/dxsdk/d3dx9xof.h}
-tags: {wine: c1cf13a7512387885616684130b605a7640f5187}
+tags: {wine: 22970932d014f024fcf7f0f98b1a5384b1b1eb99}