devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=dc013b8626085d2ec7953abccb67b7c123773ac4
commit dc013b8626085d2ec7953abccb67b7c123773ac4 Author: Christopher Michael <[email protected]> Date: Fri Apr 17 16:12:19 2020 -0400 e_comp_wl_dmabuf: Format this file properly NB: No functional changes (yet), just formatting to make this code remotely readable. --- src/bin/e_comp_wl_dmabuf.c | 735 ++++++++++++++++++++++----------------------- 1 file changed, 364 insertions(+), 371 deletions(-) diff --git a/src/bin/e_comp_wl_dmabuf.c b/src/bin/e_comp_wl_dmabuf.c index 4e0276732..f8c1c6a1b 100644 --- a/src/bin/e_comp_wl_dmabuf.c +++ b/src/bin/e_comp_wl_dmabuf.c @@ -47,314 +47,308 @@ static void linux_dmabuf_buffer_destroy(struct linux_dmabuf_buffer *buffer) { - int i; + int i; - for (i = 0; i < buffer->attributes.n_planes; i++) { - close(buffer->attributes.fd[i]); - buffer->attributes.fd[i] = -1; - } + for (i = 0; i < buffer->attributes.n_planes; i++) + { + close(buffer->attributes.fd[i]); + buffer->attributes.fd[i] = -1; + } - buffer->attributes.n_planes = 0; - free(buffer); + buffer->attributes.n_planes = 0; + free(buffer); } static void destroy_params(struct wl_resource *params_resource) { - struct linux_dmabuf_buffer *buffer; + struct linux_dmabuf_buffer *buffer; - buffer = wl_resource_get_user_data(params_resource); + buffer = wl_resource_get_user_data(params_resource); - if (!buffer) - return; + if (!buffer) return; - linux_dmabuf_buffer_destroy(buffer); + linux_dmabuf_buffer_destroy(buffer); } static void params_destroy(struct wl_client *client, struct wl_resource *resource) { - wl_resource_destroy(resource); + wl_resource_destroy(resource); } static void -params_add(struct wl_client *client, - struct wl_resource *params_resource, - int32_t name_fd, - uint32_t plane_idx, - uint32_t offset, - uint32_t stride, - uint32_t modifier_hi, - uint32_t modifier_lo) +params_add(struct wl_client *client, struct wl_resource *params_resource, + int32_t name_fd, uint32_t plane_idx, uint32_t offset, + uint32_t stride, uint32_t modifier_hi, uint32_t modifier_lo) { - struct linux_dmabuf_buffer *buffer; - - buffer = wl_resource_get_user_data(params_resource); - if (!buffer) { - wl_resource_post_error(params_resource, - ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_ALREADY_USED, - "params was already used to create a wl_buffer"); - close(name_fd); - return; - } - - assert(buffer->params_resource == params_resource); - assert(!buffer->buffer_resource); - - if (plane_idx >= MAX_DMABUF_PLANES) { - wl_resource_post_error(params_resource, - ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_PLANE_IDX, - "plane index %u is too high", plane_idx); - close(name_fd); - return; - } - - if (buffer->attributes.fd[plane_idx] != -1) { - wl_resource_post_error(params_resource, - ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_PLANE_SET, - "a dmabuf has already been added for plane %u", - plane_idx); - close(name_fd); - return; - } - - buffer->attributes.fd[plane_idx] = name_fd; - buffer->attributes.offset[plane_idx] = offset; - buffer->attributes.stride[plane_idx] = stride; - if (wl_resource_get_version(params_resource) < ZWP_LINUX_DMABUF_V1_MODIFIER_SINCE_VERSION) - buffer->attributes.modifier[plane_idx] = DRM_FORMAT_MOD_INVALID; - else - buffer->attributes.modifier[plane_idx] = ((uint64_t)modifier_hi << 32) | - modifier_lo; - buffer->attributes.n_planes++; -} + struct linux_dmabuf_buffer *buffer; + + buffer = wl_resource_get_user_data(params_resource); + if (!buffer) + { + wl_resource_post_error(params_resource, + ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_ALREADY_USED, + "params was already used to create a wl_buffer"); + close(name_fd); + return; + } + + assert(buffer->params_resource == params_resource); + assert(!buffer->buffer_resource); + + if (plane_idx >= MAX_DMABUF_PLANES) + { + wl_resource_post_error(params_resource, + ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_PLANE_IDX, + "plane index %u is too high", plane_idx); + close(name_fd); + return; + } + + if (buffer->attributes.fd[plane_idx] != -1) + { + wl_resource_post_error(params_resource, + ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_PLANE_SET, + "a dmabuf has already been added for plane %u", + plane_idx); + close(name_fd); + return; + } + + buffer->attributes.fd[plane_idx] = name_fd; + buffer->attributes.offset[plane_idx] = offset; + buffer->attributes.stride[plane_idx] = stride; + if (wl_resource_get_version(params_resource) < ZWP_LINUX_DMABUF_V1_MODIFIER_SINCE_VERSION) + buffer->attributes.modifier[plane_idx] = DRM_FORMAT_MOD_INVALID; + else + { + buffer->attributes.modifier[plane_idx] = + ((uint64_t)modifier_hi << 32) | modifier_lo; + buffer->attributes.n_planes++; + } static void -linux_dmabuf_wl_buffer_destroy(struct wl_client *client, - struct wl_resource *resource) +linux_dmabuf_wl_buffer_destroy(struct wl_client *client, struct wl_resource *resource) { - wl_resource_destroy(resource); + wl_resource_destroy(resource); } -static const struct wl_buffer_interface linux_dmabuf_buffer_implementation = { - linux_dmabuf_wl_buffer_destroy +static const struct wl_buffer_interface linux_dmabuf_buffer_implementation = +{ + linux_dmabuf_wl_buffer_destroy }; static void destroy_linux_dmabuf_wl_buffer(struct wl_resource *resource) { - struct linux_dmabuf_buffer *buffer; + struct linux_dmabuf_buffer *buffer; - buffer = wl_resource_get_user_data(resource); - assert(buffer->buffer_resource == resource); - assert(!buffer->params_resource); + buffer = wl_resource_get_user_data(resource); + assert(buffer->buffer_resource == resource); + assert(!buffer->params_resource); - if (buffer->user_data_destroy_func) - buffer->user_data_destroy_func(buffer); + if (buffer->user_data_destroy_func) + buffer->user_data_destroy_func(buffer); - linux_dmabuf_buffer_destroy(buffer); + linux_dmabuf_buffer_destroy(buffer); } static void -params_create_common(struct wl_client *client, - struct wl_resource *params_resource, - uint32_t buffer_id, - int32_t width, - int32_t height, - uint32_t format, - uint32_t flags) +params_create_common(struct wl_client *client, struct wl_resource *params_resource, + uint32_t buffer_id, int32_t width, int32_t height, + uint32_t format, uint32_t flags) { - struct linux_dmabuf_buffer *buffer; - int i; - - buffer = wl_resource_get_user_data(params_resource); - - if (!buffer) { - wl_resource_post_error(params_resource, - ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_ALREADY_USED, - "params was already used to create a wl_buffer"); - return; - } - - assert(buffer->params_resource == params_resource); - assert(!buffer->buffer_resource); - - /* Switch the linux_dmabuf_buffer object from params resource to - * eventually wl_buffer resource. - */ - wl_resource_set_user_data(buffer->params_resource, NULL); - buffer->params_resource = NULL; - - if (!buffer->attributes.n_planes) { - wl_resource_post_error(params_resource, - ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INCOMPLETE, - "no dmabuf has been added to the params"); - goto err_out; - } - - /* Check for holes in the dmabufs set (e.g. [0, 1, 3]) */ - for (i = 0; i < buffer->attributes.n_planes; i++) { - if (buffer->attributes.fd[i] == -1) { - wl_resource_post_error(params_resource, - ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INCOMPLETE, - "no dmabuf has been added for plane %i", i); - goto err_out; - } - } - - buffer->attributes.version = 1; - buffer->attributes.width = width; - buffer->attributes.height = height; - buffer->attributes.format = format; - buffer->attributes.flags = flags; - - if (width < 1 || height < 1) { - wl_resource_post_error(params_resource, - ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INVALID_DIMENSIONS, - "invalid width %d or height %d", width, height); - goto err_out; - } - - for (i = 0; i < buffer->attributes.n_planes; i++) { - off_t size; - - if ((uint64_t) buffer->attributes.offset[i] + buffer->attributes.stride[i] > UINT32_MAX) { - wl_resource_post_error(params_resource, - ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS, - "size overflow for plane %i", i); - goto err_out; - } - - if (i == 0 && - (uint64_t) buffer->attributes.offset[i] + - (uint64_t) buffer->attributes.stride[i] * height > UINT32_MAX) { - wl_resource_post_error(params_resource, - ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS, - "size overflow for plane %i", i); - goto err_out; - } - - /* Don't report an error as it might be caused - * by the kernel not supporting seeking on dmabuf */ - size = lseek(buffer->attributes.fd[i], 0, SEEK_END); - if (size == -1) - continue; - - if (buffer->attributes.offset[i] >= size) { - wl_resource_post_error(params_resource, - ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS, - "invalid offset %i for plane %i", - buffer->attributes.offset[i], i); - goto err_out; - } - - if (buffer->attributes.offset[i] + buffer->attributes.stride[i] > size) { - wl_resource_post_error(params_resource, - ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS, - "invalid stride %i for plane %i", - buffer->attributes.stride[i], i); - goto err_out; - } - - /* Only valid for first plane as other planes might be - * sub-sampled according to fourcc format */ - if (i == 0 && - buffer->attributes.offset[i] + buffer->attributes.stride[i] * height > size) { - wl_resource_post_error(params_resource, - ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS, - "invalid buffer stride or height for plane %i", i); - goto err_out; - } - } - - /* XXX: Some additional sanity checks could be done with respect - * to the fourcc format. A centralized collection (kernel or - * libdrm) would be useful to avoid code duplication for these - * checks (e.g. drm_format_num_planes). - */ - - if (!e_pixmap_dmabuf_test(buffer)) - goto err_failed; - - buffer->buffer_resource = wl_resource_create(client, - &wl_buffer_interface, - 1, buffer_id); - if (!buffer->buffer_resource) { - wl_resource_post_no_memory(params_resource); - goto err_buffer; - } - - wl_resource_set_implementation(buffer->buffer_resource, - &linux_dmabuf_buffer_implementation, - buffer, destroy_linux_dmabuf_wl_buffer); - - /* send 'created' event when the request is not for an immediate - * import, ie buffer_id is zero */ - if (buffer_id == 0) - zwp_linux_buffer_params_v1_send_created(params_resource, - buffer->buffer_resource); - - return; + struct linux_dmabuf_buffer *buffer; + int i; + + buffer = wl_resource_get_user_data(params_resource); + + if (!buffer) + { + wl_resource_post_error(params_resource, + ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_ALREADY_USED, + "params was already used to create a wl_buffer"); + return; + } + + assert(buffer->params_resource == params_resource); + assert(!buffer->buffer_resource); + + /* Switch the linux_dmabuf_buffer object from params resource to + * eventually wl_buffer resource. + */ + wl_resource_set_user_data(buffer->params_resource, NULL); + buffer->params_resource = NULL; + + if (!buffer->attributes.n_planes) + { + wl_resource_post_error(params_resource, + ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INCOMPLETE, + "no dmabuf has been added to the params"); + goto err_out; + } + + /* Check for holes in the dmabufs set (e.g. [0, 1, 3]) */ + for (i = 0; i < buffer->attributes.n_planes; i++) + { + if (buffer->attributes.fd[i] == -1) + { + wl_resource_post_error(params_resource, + ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INCOMPLETE, + "no dmabuf has been added for plane %i", i); + goto err_out; + } + } + + buffer->attributes.version = 1; + buffer->attributes.width = width; + buffer->attributes.height = height; + buffer->attributes.format = format; + buffer->attributes.flags = flags; + + if (width < 1 || height < 1) + { + wl_resource_post_error(params_resource, + ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INVALID_DIMENSIONS, + "invalid width %d or height %d", width, height); + goto err_out; + } + + for (i = 0; i < buffer->attributes.n_planes; i++) + { + off_t size; + + if ((uint64_t) buffer->attributes.offset[i] + buffer->attributes.stride[i] > UINT32_MAX) { + wl_resource_post_error(params_resource, + ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS, + "size overflow for plane %i", i); + goto err_out; + } + + if (i == 0 && + (uint64_t) buffer->attributes.offset[i] + + (uint64_t) buffer->attributes.stride[i] * height > UINT32_MAX) + { + wl_resource_post_error(params_resource, + ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS, + "size overflow for plane %i", i); + goto err_out; + } + + /* Don't report an error as it might be caused + * by the kernel not supporting seeking on dmabuf */ + size = lseek(buffer->attributes.fd[i], 0, SEEK_END); + if (size == -1) continue; + + if (buffer->attributes.offset[i] >= size) + { + wl_resource_post_error(params_resource, + ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS, + "invalid offset %i for plane %i", + buffer->attributes.offset[i], i); + goto err_out; + } + + if (buffer->attributes.offset[i] + buffer->attributes.stride[i] > size) + { + wl_resource_post_error(params_resource, + ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS, + "invalid stride %i for plane %i", + buffer->attributes.stride[i], i); + goto err_out; + } + + /* Only valid for first plane as other planes might be + * sub-sampled according to fourcc format */ + if (i == 0 && + buffer->attributes.offset[i] + buffer->attributes.stride[i] * height > size) + { + wl_resource_post_error(params_resource, + ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_OUT_OF_BOUNDS, + "invalid buffer stride or height for plane %i", i); + goto err_out; + } + } + + /* XXX: Some additional sanity checks could be done with respect + * to the fourcc format. A centralized collection (kernel or + * libdrm) would be useful to avoid code duplication for these + * checks (e.g. drm_format_num_planes). + */ + + if (!e_pixmap_dmabuf_test(buffer)) goto err_failed; + + buffer->buffer_resource = + wl_resource_create(client, &wl_buffer_interface, 1, buffer_id); + if (!buffer->buffer_resource) + { + wl_resource_post_no_memory(params_resource); + goto err_buffer; + } + + wl_resource_set_implementation(buffer->buffer_resource, + &linux_dmabuf_buffer_implementation, + buffer, destroy_linux_dmabuf_wl_buffer); + + /* send 'created' event when the request is not for an immediate + * import, ie buffer_id is zero */ + if (buffer_id == 0) + zwp_linux_buffer_params_v1_send_created(params_resource, + buffer->buffer_resource); + + return; err_buffer: - if (buffer->user_data_destroy_func) - buffer->user_data_destroy_func(buffer); + if (buffer->user_data_destroy_func) buffer->user_data_destroy_func(buffer); err_failed: - if (buffer_id == 0) - zwp_linux_buffer_params_v1_send_failed(params_resource); - else - /* since the behavior is left implementation defined by the - * protocol in case of create_immed failure due to an unknown cause, - * we choose to treat it as a fatal error and immediately kill the - * client instead of creating an invalid handle and waiting for it - * to be used. - */ - wl_resource_post_error(params_resource, - ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INVALID_WL_BUFFER, - "importing the supplied dmabufs failed"); + if (buffer_id == 0) + zwp_linux_buffer_params_v1_send_failed(params_resource); + else + /* since the behavior is left implementation defined by the + * protocol in case of create_immed failure due to an unknown cause, + * we choose to treat it as a fatal error and immediately kill the + * client instead of creating an invalid handle and waiting for it + * to be used. + */ + wl_resource_post_error(params_resource, + ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INVALID_WL_BUFFER, + "importing the supplied dmabufs failed"); err_out: - linux_dmabuf_buffer_destroy(buffer); + linux_dmabuf_buffer_destroy(buffer); } static void -params_create(struct wl_client *client, - struct wl_resource *params_resource, - int32_t width, - int32_t height, - uint32_t format, - uint32_t flags) +params_create(struct wl_client *client, struct wl_resource *params_resource, + int32_t width, int32_t height, uint32_t format, uint32_t flags) { - params_create_common(client, params_resource, 0, width, height, format, - flags); + params_create_common(client, params_resource, 0, width, height, format, flags); } static void -params_create_immed(struct wl_client *client, - struct wl_resource *params_resource, - uint32_t buffer_id, - int32_t width, - int32_t height, - uint32_t format, - uint32_t flags) +params_create_immed(struct wl_client *client, struct wl_resource *params_resource, + uint32_t buffer_id, int32_t width, int32_t height, + uint32_t format, uint32_t flags) { - params_create_common(client, params_resource, buffer_id, width, height, - format, flags); + params_create_common(client, params_resource, buffer_id, width, height, + format, flags); } static const struct zwp_linux_buffer_params_v1_interface -zwp_linux_buffer_params_implementation = { - params_destroy, - params_add, - params_create, - params_create_immed +zwp_linux_buffer_params_implementation = +{ + params_destroy, + params_add, + params_create, + params_create_immed }; static void linux_dmabuf_destroy(struct wl_client *client, struct wl_resource *resource) { - wl_resource_destroy(resource); + wl_resource_destroy(resource); } static void @@ -362,40 +356,38 @@ linux_dmabuf_create_params(struct wl_client *client, struct wl_resource *linux_dmabuf_resource, uint32_t params_id) { - void *compositor; - struct linux_dmabuf_buffer *buffer; - uint32_t version; - int i; + void *compositor; + struct linux_dmabuf_buffer *buffer; + uint32_t version; + int i; - version = wl_resource_get_version(linux_dmabuf_resource); - compositor = wl_resource_get_user_data(linux_dmabuf_resource); + version = wl_resource_get_version(linux_dmabuf_resource); + compositor = wl_resource_get_user_data(linux_dmabuf_resource); - buffer = calloc(1, sizeof *buffer); - if (!buffer) - goto err_out; + buffer = calloc(1, sizeof *buffer); + if (!buffer) goto err_out; - for (i = 0; i < MAX_DMABUF_PLANES; i++) - buffer->attributes.fd[i] = -1; + for (i = 0; i < MAX_DMABUF_PLANES; i++) + buffer->attributes.fd[i] = -1; - buffer->compositor = compositor; - buffer->params_resource = - wl_resource_create(client, - &zwp_linux_buffer_params_v1_interface, - version, params_id); - if (!buffer->params_resource) - goto err_dealloc; + buffer->compositor = compositor; + buffer->params_resource = + wl_resource_create(client, &zwp_linux_buffer_params_v1_interface, + version, params_id); + if (!buffer->params_resource) + goto err_dealloc; - wl_resource_set_implementation(buffer->params_resource, - &zwp_linux_buffer_params_implementation, - buffer, destroy_params); + wl_resource_set_implementation(buffer->params_resource, + &zwp_linux_buffer_params_implementation, + buffer, destroy_params); - return; + return; err_dealloc: - free(buffer); + free(buffer); err_out: - wl_resource_post_no_memory(linux_dmabuf_resource); + wl_resource_post_no_memory(linux_dmabuf_resource); } /** Get the linux_dmabuf_buffer from a wl_buffer resource @@ -410,21 +402,20 @@ err_out: EINTERN struct linux_dmabuf_buffer * linux_dmabuf_buffer_get(struct wl_resource *resource) { - struct linux_dmabuf_buffer *buffer; + struct linux_dmabuf_buffer *buffer; - if (!resource) - return NULL; + if (!resource) return NULL; - if (!wl_resource_instance_of(resource, &wl_buffer_interface, - &linux_dmabuf_buffer_implementation)) - return NULL; + if (!wl_resource_instance_of(resource, &wl_buffer_interface, + &linux_dmabuf_buffer_implementation)) + return NULL; - buffer = wl_resource_get_user_data(resource); - assert(buffer); - assert(!buffer->params_resource); - assert(buffer->buffer_resource == resource); + buffer = wl_resource_get_user_data(resource); + assert(buffer); + assert(!buffer->params_resource); + assert(buffer->buffer_resource == resource); - return buffer; + return buffer; } /** Set renderer-private data @@ -445,14 +436,13 @@ linux_dmabuf_buffer_get(struct wl_resource *resource) * \sa weston_compositor_import_dmabuf */ EINTERN void -linux_dmabuf_buffer_set_user_data(struct linux_dmabuf_buffer *buffer, - void *data, +linux_dmabuf_buffer_set_user_data(struct linux_dmabuf_buffer *buffer, void *data, dmabuf_user_data_destroy_func func) { - assert(data == NULL || buffer->user_data == NULL); + assert(data == NULL || buffer->user_data == NULL); - buffer->user_data = data; - buffer->user_data_destroy_func = func; + buffer->user_data = data; + buffer->user_data_destroy_func = func; } /** Get renderer-private data @@ -467,74 +457,79 @@ linux_dmabuf_buffer_set_user_data(struct linux_dmabuf_buffer *buffer, EINTERN void * linux_dmabuf_buffer_get_user_data(struct linux_dmabuf_buffer *buffer) { - return buffer->user_data; + return buffer->user_data; } -static const struct zwp_linux_dmabuf_v1_interface linux_dmabuf_implementation = { - linux_dmabuf_destroy, - linux_dmabuf_create_params +static const struct zwp_linux_dmabuf_v1_interface linux_dmabuf_implementation = +{ + linux_dmabuf_destroy, + linux_dmabuf_create_params }; static void -bind_linux_dmabuf(struct wl_client *client, - void *data, uint32_t version, uint32_t id) +bind_linux_dmabuf(struct wl_client *client, void *data, uint32_t version, uint32_t id) { - void *compositor = data; - struct wl_resource *resource; - int *formats = NULL; - uint64_t *modifiers = NULL; - int num_formats, num_modifiers; - uint64_t modifier_invalid = DRM_FORMAT_MOD_INVALID; - int i, j; - - resource = wl_resource_create(client, &zwp_linux_dmabuf_v1_interface, - version, id); - if (resource == NULL) { - wl_client_post_no_memory(client); - return; - } - - wl_resource_set_implementation(resource, &linux_dmabuf_implementation, - compositor, NULL); - - if (version < ZWP_LINUX_DMABUF_V1_MODIFIER_SINCE_VERSION) - return; - /* - * Use EGL_EXT_image_dma_buf_import_modifiers to query and advertise - * format/modifier codes. - */ - e_pixmap_dmabuf_formats_query(&formats, - &num_formats); - - for (i = 0; i < num_formats; i++) { - e_pixmap_dmabuf_modifiers_query( - formats[i], - &modifiers, - &num_modifiers); - - /* send DRM_FORMAT_MOD_INVALID token when no modifiers are supported - * for this format */ - if (num_modifiers == 0) { - num_modifiers = 1; - modifiers = &modifier_invalid; - } - for (j = 0; j < num_modifiers; j++) { - if (version >= ZWP_LINUX_DMABUF_V1_MODIFIER_SINCE_VERSION) { - uint32_t modifier_lo = modifiers[j] & 0xFFFFFFFF; - uint32_t modifier_hi = modifiers[j] >> 32; - zwp_linux_dmabuf_v1_send_modifier(resource, formats[i], - modifier_hi, - modifier_lo); - } else if (modifiers[j] == DRM_FORMAT_MOD_LINEAR || - modifiers == &modifier_invalid) { - zwp_linux_dmabuf_v1_send_format(resource, - formats[i]); - } - } - if (modifiers != &modifier_invalid) - free(modifiers); - } - free(formats); + void *compositor = data; + struct wl_resource *resource; + int *formats = NULL; + uint64_t *modifiers = NULL; + int num_formats, num_modifiers; + uint64_t modifier_invalid = DRM_FORMAT_MOD_INVALID; + int i, j; + + resource = + wl_resource_create(client, &zwp_linux_dmabuf_v1_interface, version, id); + if (resource == NULL) + { + wl_client_post_no_memory(client); + return; + } + + wl_resource_set_implementation(resource, &linux_dmabuf_implementation, + compositor, NULL); + + if (version < ZWP_LINUX_DMABUF_V1_MODIFIER_SINCE_VERSION) + return; + + /* + * Use EGL_EXT_image_dma_buf_import_modifiers to query and advertise + * format/modifier codes. + */ + e_pixmap_dmabuf_formats_query(&formats, &num_formats); + + for (i = 0; i < num_formats; i++) + { + e_pixmap_dmabuf_modifiers_query(formats[i], &modifiers, &num_modifiers); + + /* send DRM_FORMAT_MOD_INVALID token when no modifiers are supported + * for this format */ + if (num_modifiers == 0) + { + num_modifiers = 1; + modifiers = &modifier_invalid; + } + + for (j = 0; j < num_modifiers; j++) + { + if (version >= ZWP_LINUX_DMABUF_V1_MODIFIER_SINCE_VERSION) + { + uint32_t modifier_lo = modifiers[j] & 0xFFFFFFFF; + uint32_t modifier_hi = modifiers[j] >> 32; + + zwp_linux_dmabuf_v1_send_modifier(resource, formats[i], + modifier_hi, + modifier_lo); + } + else if (modifiers[j] == DRM_FORMAT_MOD_LINEAR || + modifiers == &modifier_invalid) + { + zwp_linux_dmabuf_v1_send_format(resource, formats[i]); + } + } + if (modifiers != &modifier_invalid) + free(modifiers); + } + free(formats); } /** Advertise linux_dmabuf support @@ -551,12 +546,11 @@ bind_linux_dmabuf(struct wl_client *client, EINTERN int linux_dmabuf_setup(struct wl_display *display) { - if (!wl_global_create(display, - &zwp_linux_dmabuf_v1_interface, 3, - NULL, bind_linux_dmabuf)) - return -1; + if (!wl_global_create(display, &zwp_linux_dmabuf_v1_interface, 3, + NULL, bind_linux_dmabuf)) + return -1; - return 0; + return 0; } /** Resolve an internal compositor error by disconnecting the client. @@ -579,18 +573,17 @@ EINTERN void linux_dmabuf_buffer_send_server_error(struct linux_dmabuf_buffer *buffer, const char *msg) { - struct wl_client *client; - struct wl_resource *display_resource; - uint32_t id; - - assert(buffer->buffer_resource); - id = wl_resource_get_id(buffer->buffer_resource); - client = wl_resource_get_client(buffer->buffer_resource); - display_resource = wl_client_get_object(client, 1); - - assert(display_resource); - wl_resource_post_error(display_resource, - WL_DISPLAY_ERROR_INVALID_OBJECT, - "linux_dmabuf server error with " - "wl_buffer@%u: %s", id, msg); + struct wl_client *client; + struct wl_resource *display_resource; + uint32_t id; + + assert(buffer->buffer_resource); + id = wl_resource_get_id(buffer->buffer_resource); + client = wl_resource_get_client(buffer->buffer_resource); + display_resource = wl_client_get_object(client, 1); + + assert(display_resource); + wl_resource_post_error(display_resource, WL_DISPLAY_ERROR_INVALID_OBJECT, + "linux_dmabuf server error with " + "wl_buffer@%u: %s", id, msg); } --
