AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan/wsi: unify format logic in dmabuf_handle_modifier

Browse Source 
This function has a switch which currently duplicates the format
handling logic.

Move this logic out of the switch.

This avoids repeating the same code for each supported format and
prepares the work for proper DRM_FORMAT_MOD_INVALID handling.

Signed-off-by: Simon Ser <contact@emersion.fr>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4942>
This commit is contained in:
Simon Ser
2020-05-28 19:54:49 +02:00
committed by Marge Bot
parent 63df413f95
commit 14f0c0d9db
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vulkan/wsi/wsi_common_wayland.c
+7 -5
View File
@@ -303,6 +303,7 @@ dmabuf_handle_modifier(void *data, struct zwp_linux_dmabuf_v1 *dmabuf,
uint32_t modifier_lo)
{
struct wsi_wl_display *display = data;
struct u_vector *modifiers;
uint64_t *mod = NULL;
/* If we're not fetching formats, don't fetch modifiers either. */
@@ -315,17 +316,18 @@ dmabuf_handle_modifier(void *data, struct zwp_linux_dmabuf_v1 *dmabuf,
switch (format) {
case WL_DRM_FORMAT_ARGB8888:
wsi_wl_display_add_wl_format(display, &display->dmabuf.formats, format);
mod = u_vector_add(&display->dmabuf.modifiers.argb8888);
modifiers = &display->dmabuf.modifiers.argb8888;
break;
case WL_DRM_FORMAT_XRGB8888:
wsi_wl_display_add_wl_format(display, &display->dmabuf.formats, format);
mod = u_vector_add(&display->dmabuf.modifiers.xrgb8888);
modifiers = &display->dmabuf.modifiers.xrgb8888;
break;
default:
break;
return; /* Unsupported format */
}
wsi_wl_display_add_wl_format(display, &display->dmabuf.formats, format);
mod = u_vector_add(modifiers);
if (!mod)
return;