mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm-formats: save result of intersection in the first array

Browse Source 
In the current API, we have some set operations: join, intersect and
subtract. Both join and subtract receives two DRM format arrays and save
the result in the first one.

For the intersection we have a slightly different approach, what makes
the API weird. We don't save the result in the arguments, instead we
return a new array with the result.

Modify weston_drm_format_array_intersect() in order to make it similar
to the other two set operations.

Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
Reviewed-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
This commit is contained in:
Leandro Ribeiro
2021-08-30 12:52:26 -03:00
committed by Pekka Paalanen
parent ec0b717d77
commit c51d4ad9c8
3 changed files with 43 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/drm-formats.c
+13 -11
View File
@@ -320,17 +320,14 @@ modifiers_intersect(const struct weston_drm_format *fmt_A,
}
/**
* Compute the intersection between two DRM-format arrays
* Compute the intersection between two DRM-format arrays, keeping the result in A
*
* Callers are responsible for destroying the returned array.
*
* @param formats_A One of the weston_drm_format_array
* @param formats_A The weston_drm_format_array that keeps the result
* @param formats_B The other weston_drm_format_array
* @return Array with formats and modifiers that are present
* on both A and B, or NULL on failure
* @return 0 on success, -1 on failure
*/
WL_EXPORT struct weston_drm_format_array *
weston_drm_format_array_intersect(const struct weston_drm_format_array *formats_A,
WL_EXPORT int
weston_drm_format_array_intersect(struct weston_drm_format_array *formats_A,
const struct weston_drm_format_array *formats_B)
{
struct weston_drm_format_array *formats_result;
@@ -339,7 +336,7 @@ weston_drm_format_array_intersect(const struct weston_drm_format_array *formats_
formats_result = weston_drm_format_array_create();
if (!formats_result)
return NULL;
return -1;
wl_array_for_each(fmt_A, &formats_A->arr) {
fmt_B = weston_drm_format_array_find_format(formats_B,
@@ -360,11 +357,16 @@ weston_drm_format_array_intersect(const struct weston_drm_format_array *formats_
weston_drm_format_array_remove_latest_format(formats_result);
}
return formats_result;
ret = weston_drm_format_array_replace(formats_A, formats_result);
if (ret < 0)
goto err;
weston_drm_format_array_destroy(formats_result);
return 0;
err:
weston_drm_format_array_destroy(formats_result);
return NULL;
return -1;
}
static int
libweston/libweston-internal.h
+2 -2
View File
@@ -372,8 +372,8 @@ int
weston_drm_format_array_join(struct weston_drm_format_array *formats_A,
const struct weston_drm_format_array *formats_B);
struct weston_drm_format_array *
weston_drm_format_array_intersect(const struct weston_drm_format_array *formats_A,
int
weston_drm_format_array_intersect(struct weston_drm_format_array *formats_A,
const struct weston_drm_format_array *formats_B);
int