Henri Verbeet : wined3d: Use wined3d_bit_scan() in wined3d_context_gl_map_fixed_function_samplers().
Alexandre Julliard
julliard at winehq.org
Thu Jan 27 15:36:18 CST 2022
Module: wine
Branch: master
Commit: c265f2f2ac1734350f3509b99909640514e70f0e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c265f2f2ac1734350f3509b99909640514e70f0e
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Jan 27 15:58:01 2022 +0100
wined3d: Use wined3d_bit_scan() in wined3d_context_gl_map_fixed_function_samplers().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/context_gl.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c
index 29794fe0f35..9236d2db90f 100644
--- a/dlls/wined3d/context_gl.c
+++ b/dlls/wined3d/context_gl.c
@@ -3570,18 +3570,16 @@ static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_contex
{
const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info;
unsigned int i, tex;
- WORD ffu_map;
+ uint32_t ffu_map;
ffu_map = context_gl->c.fixed_function_usage_map;
if (d3d_info->limits.ffp_textures == d3d_info->limits.ffp_blend_stages
|| context_gl->c.lowest_disabled_stage <= d3d_info->limits.ffp_textures)
{
- for (i = 0; ffu_map; ffu_map >>= 1, ++i)
+ while (ffu_map)
{
- if (!(ffu_map & 1))
- continue;
-
+ i = wined3d_bit_scan(&ffu_map);
if (context_gl->tex_unit_map[i] != i)
{
wined3d_context_gl_map_stage(context_gl, i, i);
@@ -3594,11 +3592,9 @@ static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_contex
/* Now work out the mapping */
tex = 0;
- for (i = 0; ffu_map; ffu_map >>= 1, ++i)
+ while (ffu_map)
{
- if (!(ffu_map & 1))
- continue;
-
+ i = wined3d_bit_scan(&ffu_map);
if (context_gl->tex_unit_map[i] != tex)
{
wined3d_context_gl_map_stage(context_gl, i, tex);
More information about the wine-cvs
mailing list