Henri Verbeet : wined3d: Use wined3d_uint32_compare() in glsl_program_key_compare().
Alexandre Julliard
julliard at winehq.org
Wed Jan 26 15:57:31 CST 2022
Module: wine
Branch: master
Commit: 8350e026e81c039c2ebb155c129dd5785078be58
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8350e026e81c039c2ebb155c129dd5785078be58
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Jan 26 15:43:40 2022 +0100
wined3d: Use wined3d_uint32_compare() in glsl_program_key_compare().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/glsl_shader.c | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index e6381265def..e33cd5d5fe0 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -10978,24 +10978,20 @@ static int glsl_program_key_compare(const void *key, const struct wine_rb_entry
const struct glsl_program_key *k = key;
const struct glsl_shader_prog_link *prog = WINE_RB_ENTRY_VALUE(entry,
const struct glsl_shader_prog_link, program_lookup_entry);
+ int ret;
- if (k->vs_id > prog->vs.id) return 1;
- else if (k->vs_id < prog->vs.id) return -1;
-
- if (k->gs_id > prog->gs.id) return 1;
- else if (k->gs_id < prog->gs.id) return -1;
-
- if (k->ps_id > prog->ps.id) return 1;
- else if (k->ps_id < prog->ps.id) return -1;
-
- if (k->hs_id > prog->hs.id) return 1;
- else if (k->hs_id < prog->hs.id) return -1;
-
- if (k->ds_id > prog->ds.id) return 1;
- else if (k->ds_id < prog->ds.id) return -1;
-
- if (k->cs_id > prog->cs.id) return 1;
- else if (k->cs_id < prog->cs.id) return -1;
+ if ((ret = wined3d_uint32_compare(k->vs_id, prog->vs.id)))
+ return ret;
+ if ((ret = wined3d_uint32_compare(k->gs_id, prog->gs.id)))
+ return ret;
+ if ((ret = wined3d_uint32_compare(k->ps_id, prog->ps.id)))
+ return ret;
+ if ((ret = wined3d_uint32_compare(k->hs_id, prog->hs.id)))
+ return ret;
+ if ((ret = wined3d_uint32_compare(k->ds_id, prog->ds.id)))
+ return ret;
+ if ((ret = wined3d_uint32_compare(k->cs_id, prog->cs.id)))
+ return ret;
return 0;
}
More information about the wine-cvs
mailing list