From 25e242155b9810e356e5aca7a8a0370840da56b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 20 Nov 2020 17:58:16 -0500 Subject: [PATCH] mesa: don't duplicate allocation code in _mesa_new_parameter_list_sized MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Zoltán Böszörményi Part-of: --- src/mesa/program/prog_parameter.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/mesa/program/prog_parameter.c b/src/mesa/program/prog_parameter.c index ed3b6d34dc9..9246031e66c 100644 --- a/src/mesa/program/prog_parameter.c +++ b/src/mesa/program/prog_parameter.c @@ -143,18 +143,9 @@ _mesa_new_parameter_list_sized(unsigned size) { struct gl_program_parameter_list *p = _mesa_new_parameter_list(); - if ((p != NULL) && (size != 0)) { - p->Size = size; - - /* alloc arrays */ - p->Parameters = (struct gl_program_parameter *) - calloc(size, sizeof(struct gl_program_parameter)); - - p->ParameterValueOffset = (unsigned *) calloc(size, sizeof(unsigned)); - - p->ParameterValues = (gl_constant_value *) - align_malloc(size * 4 *sizeof(gl_constant_value), 16); + if ((p != NULL) && (size != 0)) { + _mesa_reserve_parameter_storage(p, size); if ((p->Parameters == NULL) || (p->ParameterValues == NULL)) { free(p->Parameters); -- 2.34.1