Fix some valgrind complaints

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index bc8bc1bcfa3383f02d955f9418c0b5d2f51342b9..a375805052d6999f3f50116b93781ee47ff79034 100644 (file)
--- 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 67fee8e29a9b57639083cc1f192984216a1a3ba9..dcc8850bec031f91f1a433a9af192d0b59705c9f 100644 (file)
--- 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++;