fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-19 02:20:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use ALIGN_MALLOC for parameter lists.

Browse source
This commit is contained in:
Keith Whitwell 2005-06-08 21:57:45 +00:00
parent dce3a91a8d
commit 9899f58c76
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/mesa/shader/program.c
View file

@ -353,7 +353,8 @@ _mesa_free_parameter_list(struct program_parameter_list *paramList)
{
_mesa_free_parameters(paramList);
_mesa_free(paramList->Parameters);
_mesa_free(paramList->ParameterValues);
if (paramList->ParameterValues)
ALIGN_FREE(paramList->ParameterValues);
_mesa_free(paramList);
}
@ -385,18 +386,24 @@ add_parameter(struct program_parameter_list *paramList,
const GLuint n = paramList->NumParameters;
if (n == paramList->Size) {
GLfloat (*tmp)[4];
paramList->Size *= 2;
if (!paramList->Size)
paramList->Size = 4;
paramList->Size = 8;
paramList->Parameters = (struct program_parameter *)
_mesa_realloc(paramList->Parameters,
n * sizeof(struct program_parameter),
paramList->Size * sizeof(struct program_parameter));
paramList->ParameterValues = (GLfloat (*)[4])
_mesa_realloc(paramList->ParameterValues,
n * 4 * sizeof(GLfloat),
paramList->Size * 4 * sizeof(GLfloat));
tmp = paramList->ParameterValues;
paramList->ParameterValues = ALIGN_MALLOC(paramList->Size * 4 * sizeof(GLfloat), 16);
if (tmp) {
_mesa_memcpy(paramList->ParameterValues, tmp,
n * 4 * sizeof(GLfloat));
ALIGN_FREE(tmp);
}
}
if (!paramList->Parameters ||