From c5f5055097e8fa23e8ba8bd39b0d9b747148c996 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Tue, 10 May 2005 18:08:25 +0000 Subject: [PATCH] Fix some valgrind complaints --- src/mesa/shader/program.c | 2 -- src/mesa/tnl/t_save_api.c | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c index bc8bc1b..a375805 100644 --- a/src/mesa/shader/program.c +++ b/src/mesa/shader/program.c @@ -355,8 +355,6 @@ _mesa_free_parameter_list(struct program_parameter_list *paramList) _mesa_free(paramList->Parameters); _mesa_free(paramList->ParameterValues); _mesa_free(paramList); - paramList->Parameters = NULL; - paramList->ParameterValues = NULL; } diff --git a/src/mesa/tnl/t_save_api.c b/src/mesa/tnl/t_save_api.c index 67fee8e..dcc8850 100644 --- a/src/mesa/tnl/t_save_api.c +++ b/src/mesa/tnl/t_save_api.c @@ -242,13 +242,15 @@ static void _save_compile_vertex_list( GLcontext *ctx ) _mesa_memcpy(node->attrsz, tnl->save.attrsz, sizeof(node->attrsz)); node->vertex_size = tnl->save.vertex_size; node->buffer = tnl->save.buffer; - node->wrap_count = tnl->save.copied.nr; node->count = tnl->save.initial_counter - tnl->save.counter; + node->wrap_count = tnl->save.copied.nr; + node->have_materials = tnl->save.have_materials; + node->dangling_attr_ref = tnl->save.dangling_attr_ref; + node->normal_lengths = NULL; node->prim = tnl->save.prim; node->prim_count = tnl->save.prim_count; node->vertex_store = tnl->save.vertex_store; node->prim_store = tnl->save.prim_store; - node->normal_lengths = NULL; node->vertex_store->refcount++; node->prim_store->refcount++; -- 2.7.4