[PATCH v2 2/2] d3dx9: Reimplement make_pow2() in d3dx9_private.h.

[Matteo Bruni]

From: Sven Baars

Signed-off-by: Sven Baars 
Signed-off-by: Matteo Bruni 
---
v2: Add a version using __builtin_clz(). It returns 1 for 0, I assume
that's not an issue but if it is, please holler.

dlls/d3dx9_36/d3dx9_private.h | 19 +++++++++++++++++++
 dlls/d3dx9_36/texture.c       | 15 ---------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
index 61ec320ba52..d64b9af30c5 100644
--- a/dlls/d3dx9_36/d3dx9_private.h
+++ b/dlls/d3dx9_36/d3dx9_private.h
@@ -22,6 +22,7 @@
 #ifndef __WINE_D3DX9_PRIVATE_H
 #define __WINE_D3DX9_PRIVATE_H

+#include <stdint.h>
 #define NONAMELESSUNION
 #include "wine/debug.h"
 #include "wine/heap.h"
@@ -225,6 +226,24 @@ static inline BOOL is_param_type_sampler(D3DXPARAMETER_TYPE type)
             || type == D3DXPT_SAMPLER3D || type == D3DXPT_SAMPLERCUBE;
 }

+/* 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);
+#else
+    num--;
+    num |= num >> 1;
+    num |= num >> 2;
+    num |= num >> 4;
+    num |= num >> 8;
+    num |= num >> 16;
+    num++;
+
+    return num;
+#endif
+}
+
 struct d3dx_parameter;

enum pres_reg_tables
diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
index d96ade9aeda..6af44589047 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -30,21 +30,6 @@ static BOOL is_pow2(UINT num)
     return !(num & (num - 1));
 }

-/* Returns the smallest power of 2 which is greater than or equal to num */
-static UINT make_pow2(UINT num)
-{
-    UINT result = 1;
-
-    /* In the unlikely event somebody passes a large value, make sure we don't enter an infinite loop */
-    if (num >= 0x80000000)
-        return 0x80000000;
-
-    while (result < num)
-        result <<= 1;
-
-    return result;
-}
-
 static HRESULT get_surface(D3DRESOURCETYPE type, struct IDirect3DBaseTexture9 *tex,
         int face, UINT level, struct IDirect3DSurface9 **surf)
 {