sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

cogl/boxed-value: On _cogl_boxed_value_set_x, update copying values

Browse source 
_cogl_boxed_value_transpose is only used for the matrix type.
Now is named _cogl_boxed_value_copy_transposed_value.
Gets the transposed value considering count (to store in array type or not).
The caller doesn't have to worry about count anymore.

Instead of calling memcpy, add function _cogl_boxed_value_copy_value
which copies the value to the corresponding boxed value property
considering type and count.
The caller doesn't have to worry about type and count anymore.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3965>
This commit is contained in:
Joan Torres 2024-09-05 15:39:12 +02:00 committed by Marge Bot
parent afdd0be161
commit 3e629256ce
1 changed files with 58 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
cogl/cogl/cogl-boxed-value.c
View file

@ -109,11 +109,20 @@ _cogl_boxed_value_equal (const CoglBoxedValue *bva,
}
static void
_cogl_boxed_value_transpose (float *dst,
int size,
const float *src)
_cogl_boxed_value_copy_transposed_value (CoglBoxedValue *bv,
int size,
int count,
const float *src)
{
int value_num;
int y, x;
float *dst;
const float *src_start = src;
if (count > 1)
dst = bv->v.float_array;
else
dst = bv->v.matrix;
/* If the value is transposed we'll just transpose it now as it
* is copied into the boxed value instead of passing TRUE to
@ -121,9 +130,48 @@ _cogl_boxed_value_transpose (float *dst,
* doesn't seem like the GL driver would be able to do anything
* much smarter than this anyway */
for (y = 0; y < size; y++)
for (x = 0; x < size; x++)
*(dst++) = src[y + x * size];
for (value_num = 0; value_num < count; value_num++)
{
src = src_start + value_num * size * size;
for (y = 0; y < size; y++)
for (x = 0; x < size; x++)
*(dst++) = src[y + x * size];
}
}
static void
_cogl_boxed_value_copy_value (CoglBoxedValue *bv,
size_t value_size,
int count,
const void *value,
CoglBoxedType type)
{
switch (type)
{
case COGL_BOXED_INT:
if (count > 1)
memcpy (bv->v.int_array, value, count * value_size);
else
memcpy (bv->v.int_value, value, value_size);
return;
case COGL_BOXED_FLOAT:
if (count > 1)
memcpy (bv->v.float_array, value, count * value_size);
else
memcpy (bv->v.float_value, value, value_size);
return;
case COGL_BOXED_MATRIX:
if (count > 1)
memcpy (bv->v.float_array, value, count * value_size);
else
memcpy (bv->v.matrix, value, value_size);
return;
case COGL_BOXED_NONE:
return;
}
}
static void
@ -141,11 +189,9 @@ _cogl_boxed_value_set_x (CoglBoxedValue *bv,
g_free (bv->v.float_array);
if (transpose)
_cogl_boxed_value_transpose (bv->v.float_value,
size,
value);
_cogl_boxed_value_copy_transposed_value (bv, size, count, value);
else
memcpy (bv->v.float_value, value, value_size);
_cogl_boxed_value_copy_value (bv, value_size, count, value, type);
}
else
{
@ -163,18 +209,9 @@ _cogl_boxed_value_set_x (CoglBoxedValue *bv,
bv->v.float_array = g_malloc (count * value_size);
if (transpose)
{
int value_num;
for (value_num = 0; value_num < count; value_num++)
_cogl_boxed_value_transpose (bv->v.float_array +
value_num * size * size,
size,
(const float *) value +
value_num * size * size);
}
_cogl_boxed_value_copy_transposed_value (bv, size, count, value);
else
memcpy (bv->v.float_array, value, count * value_size);
_cogl_boxed_value_copy_value (bv, value_size, count, value, type);
}
bv->type = type;