[PATCH 6/8] wined3d: Move wined3d_bit_scan() to public header.

[Józef Kucia]

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
---
 dlls/wined3d/wined3d_private.h | 7 -------
 include/wine/wined3d.h         | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 0df3f2ab2a5e..7b265f366285 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4582,13 +4582,6 @@ static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geomet
             && geometry_shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM;
 }
 
-static inline int wined3d_bit_scan(unsigned int *x)
-{
-    int bit_offset = ffs(*x) - 1;
-    *x ^= 1u << bit_offset;
-    return bit_offset;
-}
-
 static inline DWORD wined3d_extract_bits(const DWORD *bitstream,
         unsigned int offset, unsigned int count)
 {
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index b0b1abc508e6..2a8afe8fca6f 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2782,6 +2782,13 @@ static inline unsigned int wined3d_log2i(unsigned int x)
 #endif
 }
 
+static inline int wined3d_bit_scan(unsigned int *x)
+{
+    int bit_offset = ffs(*x) - 1;
+    *x ^= 1u << bit_offset;
+    return bit_offset;
+}
+
 static inline void wined3d_box_set(struct wined3d_box *box, unsigned int left, unsigned int top,
         unsigned int right, unsigned int bottom, unsigned int front, unsigned int back)
 {
-- 
2.19.2

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=46581

Your paranoid android.


=== debian9 (build log) ===

X Error of failed request:  BadValue (integer parameter out of range for operation)
  Major opcode of failed request:  140 (RANDR)
  Minor opcode of failed request:  21 (RRSetCrtcConfig)
X Error of failed request:  BadValue (integer parameter out of range for operation)
  Major opcode of failed request:  140 (RANDR)
  Minor opcode of failed request:  21 (RRSetCrtcConfig)
X Error of failed request:  BadValue (integer parameter out of range for operation)
  Major opcode of failed request:  140 (RANDR)
  Minor opcode of failed request:  21 (RRSetCrtcConfig)
X Error of failed request:  BadValue (integer parameter out of range for operation)
  Major opcode of failed request:  140 (RANDR)
  Minor opcode of failed request:  21 (RRSetCrtcConfig)

=== debian9 (build log) ===

X Error of failed request:  BadValue (integer parameter out of range for operation)
  Major opcode of failed request:  140 (RANDR)
  Minor opcode of failed request:  21 (RRSetCrtcConfig)
X Error of failed request:  BadValue (integer parameter out of range for operation)
  Major opcode of failed request:  140 (RANDR)
  Minor opcode of failed request:  21 (RRSetCrtcConfig)
X Error of failed request:  BadValue (integer parameter out of range for operation)
  Major opcode of failed request:  140 (RANDR)
  Minor opcode of failed request:  21 (RRSetCrtcConfig)
X Error of failed request:  BadValue (integer parameter out of range for operation)
  Major opcode of failed request:  140 (RANDR)
  Minor opcode of failed request:  21 (RRSetCrtcConfig)

[Henri Verbeet]

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

[Alexandre Julliard]

Józef Kucia <jkucia(a)codeweavers.com> writes:
> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
> ---
>  dlls/wined3d/wined3d_private.h | 7 -------
>  include/wine/wined3d.h         | 7 +++++++
>  2 files changed, 7 insertions(+), 7 deletions(-)

This would require all users of that file to include wine/port.h:

In file included from ../../../wine/dlls/d3d8/d3d8_private.h:38:0,
                 from ../../../wine/dlls/d3d8/d3d8_main.c:24:
../../../wine/include/wine/wined3d.h: In function ‘wined3d_bit_scan’:
../../../wine/include/wine/wined3d.h:2787:22: warning: implicit declaration of function ‘ffs’ [-Wimplicit-function-declaration]

-- 
Alexandre Julliard
julliard(a)winehq.org

[Józef Kucia]

On Thu, Jan 24, 2019 at 5:29 PM Alexandre Julliard <julliard(a)winehq.org> wrote:
> Józef Kucia <jkucia(a)codeweavers.com> writes:
> > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
> > ---
> >  dlls/wined3d/wined3d_private.h | 7 -------
> >  include/wine/wined3d.h         | 7 +++++++
> >  2 files changed, 7 insertions(+), 7 deletions(-)
>
> This would require all users of that file to include wine/port.h:
>
> In file included from ../../../wine/dlls/d3d8/d3d8_private.h:38:0,
>                  from ../../../wine/dlls/d3d8/d3d8_main.c:24:
> ../../../wine/include/wine/wined3d.h: In function ‘wined3d_bit_scan’:
> ../../../wine/include/wine/wined3d.h:2787:22: warning: implicit declaration of function ‘ffs’ [-Wimplicit-function-declaration]

Thanks for catching this. It should be fixed in v2.