From 8350e026e81c039c2ebb155c129dd5785078be58 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 26 Jan 2022 15:43:40 +0100 Subject: [PATCH] wined3d: Use wined3d_uint32_compare() in glsl_program_key_compare(). Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- 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; } -- 2.11.4.GIT