=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Use wined3d_extract_bits().
Alexandre Julliard
julliard at winehq.org
Mon Nov 6 14:37:37 CST 2017
Module: wine
Branch: master
Commit: e15b5c06d38c22277b543c7f23003554e5486108
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15b5c06d38c22277b543c7f23003554e5486108
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Nov 6 10:55:25 2017 +0100
wined3d: Use wined3d_extract_bits().
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/wined3d/arb_program_shader.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 80c7354..f4e23d0 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -877,7 +877,7 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader
/* After subtracting privately used constants from the hardware limit(they are loaded as
* local constants), make sure the shader doesn't violate the env constant limit
*/
- if(pshader)
+ if (pshader)
{
max_constantsF = min(max_constantsF, gl_info->limits.arb_ps_float_constants);
}
@@ -905,10 +905,7 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader
{
for (i = 0; i < max_constantsF; ++i)
{
- DWORD idx, mask;
- idx = i >> 5;
- mask = 1u << (i & 0x1fu);
- if (!shader_constant_is_local(shader, i) && (reg_maps->constf[idx] & mask))
+ if (!shader_constant_is_local(shader, i) && wined3d_extract_bits(reg_maps->constf, i, 1))
{
shader_addline(buffer, "PARAM C%d = program.env[%d];\n",i, i);
}
More information about the wine-cvs
mailing list