brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl/boxed-value: On _cogl_boxed_value_set_x, simplify mem alloc

Browse Source 
Use _cogl_boxed_value_destroy to free the correspondent array instead of
free, which was only freeing float_array.

Add a new func _cogl_boxed_value_array_alloc to allocate the
corresponding array considering the type.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3965>
This commit is contained in:
Joan Torres 2024-09-05 15:55:15 +02:00 committed by Marge Bot
parent 3e629256ce
commit 1eba07f64f
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
cogl/cogl/cogl-boxed-value.c
View File

@ -108,6 +108,31 @@ _cogl_boxed_value_equal (const CoglBoxedValue *bva,
return FALSE; return FALSE;
} }
static void
_cogl_boxed_value_array_alloc (CoglBoxedValue *bv,
size_t value_size,
int count,
CoglBoxedType type)
{
if (count > 1)
{
switch (type)
{
case COGL_BOXED_INT:
bv->v.int_array = g_malloc (count * value_size);
return;
case COGL_BOXED_FLOAT:
case COGL_BOXED_MATRIX:
bv->v.float_array = g_malloc (count * value_size);
return;
case COGL_BOXED_NONE:
return;
}
}
}
static void static void
_cogl_boxed_value_copy_transposed_value (CoglBoxedValue *bv, _cogl_boxed_value_copy_transposed_value (CoglBoxedValue *bv,
int size, int size,
@ -183,36 +208,18 @@ _cogl_boxed_value_set_x (CoglBoxedValue *bv,
const void *value, const void *value,
gboolean transpose) gboolean transpose)
{ {
if (count == 1) if (bv->count != count ||
bv->size != size ||
bv->type != type)
{ {
if (bv->count > 1) _cogl_boxed_value_destroy (bv);
g_free (bv->v.float_array); _cogl_boxed_value_array_alloc (bv, value_size, count, type);
if (transpose)
_cogl_boxed_value_copy_transposed_value (bv, size, count, value);
else
_cogl_boxed_value_copy_value (bv, value_size, count, value, type);
} }
if (transpose)
_cogl_boxed_value_copy_transposed_value (bv, size, count, value);
else else
{ _cogl_boxed_value_copy_value (bv, value_size, count, value, type);
if (bv->count > 1)
{
if (bv->count != count ||
bv->size != size ||
bv->type != type)
{
g_free (bv->v.float_array);
bv->v.float_array = g_malloc (count * value_size);
}
}
else
bv->v.float_array = g_malloc (count * value_size);
if (transpose)
_cogl_boxed_value_copy_transposed_value (bv, size, count, value);
else
_cogl_boxed_value_copy_value (bv, value_size, count, value, type);
}
bv->type = type; bv->type = type;
bv->size = size; bv->size = size;