| @@ -40,8 +40,7 @@ | |||
| struct gl_program_parameter_list * | |||
| _mesa_new_parameter_list(void) | |||
| { | |||
| return (struct gl_program_parameter_list *) | |||
| _mesa_calloc(sizeof(struct gl_program_parameter_list)); | |||
| return CALLOC_STRUCT(gl_program_parameter_list); | |||
| } | |||
| @@ -230,7 +230,6 @@ _mesa_init_program_struct( GLcontext *ctx, struct gl_program *prog, | |||
| { | |||
| (void) ctx; | |||
| if (prog) { | |||
| _mesa_bzero(prog, sizeof(*prog)); | |||
| prog->Id = id; | |||
| prog->Target = target; | |||
| prog->Resident = GL_TRUE; | |||
| @@ -133,6 +133,11 @@ _mesa_free_shader_program_data(GLcontext *ctx, | |||
| _mesa_free(shProg->Shaders); | |||
| shProg->Shaders = NULL; | |||
| } | |||
| if (shProg->InfoLog) { | |||
| _mesa_free(shProg->InfoLog); | |||
| shProg->InfoLog = NULL; | |||
| } | |||
| } | |||
| @@ -143,10 +148,7 @@ void | |||
| _mesa_free_shader_program(GLcontext *ctx, struct gl_shader_program *shProg) | |||
| { | |||
| _mesa_free_shader_program_data(ctx, shProg); | |||
| if (shProg->Shaders) { | |||
| _mesa_free(shProg->Shaders); | |||
| shProg->Shaders = NULL; | |||
| } | |||
| _mesa_free(shProg); | |||
| } | |||