Henri Verbeet : wined3d: Use wined3d_bit_scan() in shader_generate_glsl_declarations().
Alexandre Julliard
julliard at winehq.org
Fri Jan 28 14:29:33 CST 2022
Module: wine
Branch: master
Commit: 1a7dbab1c45129ace79b21ca6165fa72c05fa8fa
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7dbab1c45129ace79b21ca6165fa72c05fa8fa
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Jan 28 15:47:21 2022 +0100
wined3d: Use wined3d_bit_scan() in shader_generate_glsl_declarations().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/glsl_shader.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index aa3c8780269..5a2111e46a7 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2168,7 +2168,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c
const struct wined3d_shader_lconst *lconst;
const char *prefix;
unsigned int i;
- DWORD map;
+ uint32_t map;
if (wined3d_settings.strict_shader_math)
shader_addline(buffer, "#pragma optionNV(fastmath off)\n");
@@ -2176,9 +2176,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c
prefix = shader_glsl_get_prefix(version->type);
/* Prototype the subroutines */
- for (i = 0, map = reg_maps->labels; map; map >>= 1, ++i)
+ map = reg_maps->labels;
+ while (map)
{
- if (map & 1) shader_addline(buffer, "void subroutine%u();\n", i);
+ i = wined3d_bit_scan(&map);
+ shader_addline(buffer, "void subroutine%u();\n", i);
}
if (version->type != WINED3D_SHADER_TYPE_PIXEL && version->type != WINED3D_SHADER_TYPE_COMPUTE)
@@ -2500,9 +2502,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c
}
/* Declare address variables */
- for (i = 0, map = reg_maps->address; map; map >>= 1, ++i)
+ map = reg_maps->address;
+ while (map)
{
- if (map & 1) shader_addline(buffer, "ivec4 A%u;\n", i);
+ i = wined3d_bit_scan(&map);
+ shader_addline(buffer, "ivec4 A%u;\n", i);
}
/* Declare output register temporaries */
@@ -2517,10 +2521,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c
}
else if (version->major < 4)
{
- for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i)
+ map = reg_maps->temporary;
+ while (map)
{
- if (map & 1)
- shader_addline(buffer, "vec4 R%u;\n", i);
+ i = wined3d_bit_scan(&map);
+ shader_addline(buffer, "vec4 R%u;\n", i);
}
}
More information about the wine-cvs
mailing list