Henri Verbeet : wined3d: Use wine_rb_remove() in delete_glsl_program_entry ().
Alexandre Julliard
julliard at winehq.org
Tue Sep 20 10:45:01 CDT 2016
Module: wine
Branch: master
Commit: 60833cb39aba6b7354d7c0de263be017bca24a1b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=60833cb39aba6b7354d7c0de263be017bca24a1b
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Sep 20 11:41:36 2016 +0200
wined3d: Use wine_rb_remove() in delete_glsl_program_entry().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/glsl_shader.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index e605cb9..fbba284 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -5384,12 +5384,7 @@ static struct glsl_shader_prog_link *get_glsl_program_entry(const struct shader_
static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const struct wined3d_gl_info *gl_info,
struct glsl_shader_prog_link *entry)
{
- struct glsl_program_key key;
-
- key.vs_id = entry->vs.id;
- key.gs_id = entry->gs.id;
- key.ps_id = entry->ps.id;
- wine_rb_remove_key(&priv->program_lookup, &key);
+ wine_rb_remove(&priv->program_lookup, &entry->program_lookup_entry);
GL_EXTCALL(glDeleteProgram(entry->id));
if (entry->vs.id)
More information about the wine-cvs
mailing list