=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d8: Use wined3d_bit_scan() instead of open-coding it.

Alexandre Julliard julliard at winehq.org
Fri Jan 25 16:29:07 CST 2019


Module: wine
Branch: master
Commit: 5c3d4f39e2a332f732d85f3beb4fa5d475f118fe
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5c3d4f39e2a332f732d85f3beb4fa5d475f118fe

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Fri Jan 25 09:46:53 2019 +0100

d3d8: Use wined3d_bit_scan() instead of open-coding it.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3d8/device.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 1d892ec..33ab34d 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -2280,8 +2280,7 @@ static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_device *device,
     map = device->sysmem_vb;
     while (map)
     {
-        i = ffs(map) - 1;
-        map ^= 1u << i;
+        i = wined3d_bit_scan(&map);
 
         if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, i, &dst_buffer, &offset, &stride)))
             ERR("Failed to get stream source.\n");
@@ -2618,8 +2617,7 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT
     map = device->sysmem_vb;
     while (map)
     {
-        i = ffs(map) - 1;
-        map ^= 1u << i;
+        i = wined3d_bit_scan(&map);
 
         if (FAILED(wined3d_device_get_stream_source(device->wined3d_device,
                 i, &wined3d_buffer, &offset, &stride)))
@@ -2636,8 +2634,7 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT
     map = device->sysmem_vb;
     while (map)
     {
-        i = ffs(map) - 1;
-        map ^= 1u << i;
+        i = wined3d_bit_scan(&map);
 
         if (FAILED(wined3d_device_get_stream_source(device->wined3d_device,
                 i, &wined3d_buffer, &offset, &stride)))




More information about the wine-cvs mailing list