X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fegl%2Fwayland%2Fwayland-drm%2Fwayland-drm.c;h=51cdd2cb845bcebc490e27297ab961c68c750a1b;hb=8b2fc1d1b5a822692321af1a2a01dddbc9cff356;hp=45b307f3a888c90b7588842dcd2b0a3e4c129008;hpb=1aaec8c60985ffe03af265bf8f659ee0319926ca;p=mesa.git diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c b/src/egl/wayland/wayland-drm/wayland-drm.c index 45b307f3a88..51cdd2cb845 100644 --- a/src/egl/wayland/wayland-drm/wayland-drm.c +++ b/src/egl/wayland/wayland-drm/wayland-drm.c @@ -31,75 +31,40 @@ #include #include #include +#include #include #include "wayland-drm.h" #include "wayland-drm-server-protocol.h" -/* Git master of Wayland is moving towards a stable version of the - * protocol, but breaking from 0.85 in the process. For the time - * being, it's convenient to be able to build Mesa against both master - * and 0.85.x of Wayland. To make this work we'll do a compile-time - * version check and work around the difference in API and protocol */ -#if defined (WAYLAND_VERSION_MAJOR) && \ - WAYLAND_VERSION_MAJOR == 0 && \ - WAYLAND_VERSION_MINOR == 85 -#define HAS_WAYLAND_0_85 -#endif - -struct wl_drm { - struct wl_display *display; - - void *user_data; - char *device_name; - - struct wayland_drm_callbacks *callbacks; -}; +#define MIN(x,y) (((x)<(y))?(x):(y)) static void destroy_buffer(struct wl_resource *resource) { - struct wl_drm_buffer *buffer = resource->data; + struct wl_drm_buffer *buffer = wl_resource_get_user_data(resource); struct wl_drm *drm = buffer->drm; - drm->callbacks->release_buffer(drm->user_data, buffer); + drm->callbacks.release_buffer(drm->user_data, buffer); free(buffer); } static void buffer_destroy(struct wl_client *client, struct wl_resource *resource) { -#ifdef HAS_WAYLAND_0_85 - wl_resource_destroy(resource, 0); -#else wl_resource_destroy(resource); -#endif -} - -#ifdef HAS_WAYLAND_0_85 -static void -buffer_damage(struct wl_client *client, struct wl_resource *buffer, - int32_t x, int32_t y, int32_t width, int32_t height) -{ } -#endif - -const static struct wl_buffer_interface drm_buffer_interface = { -#ifdef HAS_WAYLAND_0_85 - buffer_damage, -#endif - buffer_destroy -}; static void create_buffer(struct wl_client *client, struct wl_resource *resource, - uint32_t id, uint32_t name, int32_t width, int32_t height, + uint32_t id, uint32_t name, int fd, + int32_t width, int32_t height, uint32_t format, int32_t offset0, int32_t stride0, int32_t offset1, int32_t stride1, int32_t offset2, int32_t stride2) { - struct wl_drm *drm = resource->data; + struct wl_drm *drm = wl_resource_get_user_data(resource); struct wl_drm_buffer *buffer; buffer = calloc(1, sizeof *buffer); @@ -109,8 +74,8 @@ create_buffer(struct wl_client *client, struct wl_resource *resource, } buffer->drm = drm; - buffer->buffer.width = width; - buffer->buffer.height = height; + buffer->width = width; + buffer->height = height; buffer->format = format; buffer->offset[0] = offset0; buffer->stride[0] = stride0; @@ -119,7 +84,7 @@ create_buffer(struct wl_client *client, struct wl_resource *resource, buffer->offset[2] = offset2; buffer->stride[2] = stride2; - drm->callbacks->reference_buffer(drm->user_data, name, buffer); + drm->callbacks.reference_buffer(drm->user_data, name, fd, buffer); if (buffer->driver_buffer == NULL) { wl_resource_post_error(resource, WL_DRM_ERROR_INVALID_NAME, @@ -127,16 +92,17 @@ create_buffer(struct wl_client *client, struct wl_resource *resource, return; } - buffer->buffer.resource.object.id = id; - buffer->buffer.resource.object.interface = &wl_buffer_interface; - buffer->buffer.resource.object.implementation = - (void (**)(void)) &drm_buffer_interface; - buffer->buffer.resource.data = buffer; - - buffer->buffer.resource.destroy = destroy_buffer; - buffer->buffer.resource.client = resource->client; + buffer->resource = + wl_resource_create(client, &wl_buffer_interface, 1, id); + if (!buffer->resource) { + wl_resource_post_no_memory(resource); + free(buffer); + return; + } - wl_client_add_resource(resource->client, &buffer->buffer.resource); + wl_resource_set_implementation(buffer->resource, + (void (**)(void)) &drm->buffer_interface, + buffer, destroy_buffer); } static void @@ -145,9 +111,14 @@ drm_create_buffer(struct wl_client *client, struct wl_resource *resource, uint32_t stride, uint32_t format) { switch (format) { + case WL_DRM_FORMAT_ABGR2101010: + case WL_DRM_FORMAT_XBGR2101010: + case WL_DRM_FORMAT_ARGB2101010: + case WL_DRM_FORMAT_XRGB2101010: case WL_DRM_FORMAT_ARGB8888: case WL_DRM_FORMAT_XRGB8888: case WL_DRM_FORMAT_YUYV: + case WL_DRM_FORMAT_RGB565: break; default: wl_resource_post_error(resource, @@ -157,7 +128,7 @@ drm_create_buffer(struct wl_client *client, struct wl_resource *resource, } create_buffer(client, resource, id, - name, width, height, format, 0, stride, 0, 0, 0, 0); + name, -1, width, height, format, 0, stride, 0, 0, 0, 0); } static void @@ -185,17 +156,31 @@ drm_create_planar_buffer(struct wl_client *client, return; } - create_buffer(client, resource, id, name, width, height, format, + create_buffer(client, resource, id, name, -1, width, height, format, offset0, stride0, offset1, stride1, offset2, stride2); } +static void +drm_create_prime_buffer(struct wl_client *client, + struct wl_resource *resource, + uint32_t id, int fd, + int32_t width, int32_t height, uint32_t format, + int32_t offset0, int32_t stride0, + int32_t offset1, int32_t stride1, + int32_t offset2, int32_t stride2) +{ + create_buffer(client, resource, id, 0, fd, width, height, format, + offset0, stride0, offset1, stride1, offset2, stride2); + close(fd); +} + static void drm_authenticate(struct wl_client *client, struct wl_resource *resource, uint32_t id) { - struct wl_drm *drm = resource->data; + struct wl_drm *drm = wl_resource_get_user_data(resource); - if (drm->callbacks->authenticate(drm->user_data, id) < 0) + if (drm->callbacks.authenticate(drm->user_data, id) < 0) wl_resource_post_error(resource, WL_DRM_ERROR_AUTHENTICATE_FAIL, "authenicate failed"); @@ -203,10 +188,11 @@ drm_authenticate(struct wl_client *client, wl_resource_post_event(resource, WL_DRM_AUTHENTICATED); } -const static struct wl_drm_interface drm_interface = { +static const struct wl_drm_interface drm_interface = { drm_authenticate, drm_create_buffer, - drm_create_planar_buffer + drm_create_planar_buffer, + drm_create_prime_buffer }; static void @@ -214,14 +200,49 @@ bind_drm(struct wl_client *client, void *data, uint32_t version, uint32_t id) { struct wl_drm *drm = data; struct wl_resource *resource; + uint32_t capabilities; + + resource = wl_resource_create(client, &wl_drm_interface, + MIN(version, 2), id); + if (!resource) { + wl_client_post_no_memory(client); + return; + } + + wl_resource_set_implementation(resource, &drm_interface, data, NULL); - resource = wl_client_add_object(client, &wl_drm_interface, - &drm_interface, id, data); wl_resource_post_event(resource, WL_DRM_DEVICE, drm->device_name); + + if (drm->callbacks.is_format_supported(drm->user_data, + WL_DRM_FORMAT_ARGB2101010)) { + wl_resource_post_event(resource, WL_DRM_FORMAT, + WL_DRM_FORMAT_ARGB2101010); + } + + if (drm->callbacks.is_format_supported(drm->user_data, + WL_DRM_FORMAT_XRGB2101010)) { + wl_resource_post_event(resource, WL_DRM_FORMAT, + WL_DRM_FORMAT_XRGB2101010); + } + + if (drm->callbacks.is_format_supported(drm->user_data, + WL_DRM_FORMAT_ABGR2101010)) { + wl_resource_post_event(resource, WL_DRM_FORMAT, + WL_DRM_FORMAT_ABGR2101010); + } + + if (drm->callbacks.is_format_supported(drm->user_data, + WL_DRM_FORMAT_XBGR2101010)) { + wl_resource_post_event(resource, WL_DRM_FORMAT, + WL_DRM_FORMAT_XBGR2101010); + } + wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_ARGB8888); wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_XRGB8888); + wl_resource_post_event(resource, WL_DRM_FORMAT, + WL_DRM_FORMAT_RGB565); wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_YUV410); wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_YUV411); wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_YUV420); @@ -230,22 +251,37 @@ bind_drm(struct wl_client *client, void *data, uint32_t version, uint32_t id) wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_NV12); wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_NV16); wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_YUYV); + + capabilities = 0; + if (drm->flags & WAYLAND_DRM_PRIME) + capabilities |= WL_DRM_CAPABILITY_PRIME; + + if (version >= 2) + wl_resource_post_event(resource, WL_DRM_CAPABILITIES, capabilities); } struct wl_drm * wayland_drm_init(struct wl_display *display, char *device_name, - struct wayland_drm_callbacks *callbacks, void *user_data) + const struct wayland_drm_callbacks *callbacks, void *user_data, + uint32_t flags) { struct wl_drm *drm; drm = malloc(sizeof *drm); + if (!drm) + return NULL; drm->display = display; drm->device_name = strdup(device_name); - drm->callbacks = callbacks; + drm->callbacks = *callbacks; drm->user_data = user_data; + drm->flags = flags; + + drm->buffer_interface.destroy = buffer_destroy; - wl_display_add_global(display, &wl_drm_interface, drm, bind_drm); + drm->wl_drm_global = + wl_global_create(display, &wl_drm_interface, 2, + drm, bind_drm); return drm; } @@ -255,30 +291,7 @@ wayland_drm_uninit(struct wl_drm *drm) { free(drm->device_name); - /* FIXME: need wl_display_del_{object,global} */ + wl_global_destroy(drm->wl_drm_global); free(drm); } - -int -wayland_buffer_is_drm(struct wl_buffer *buffer) -{ - return buffer->resource.object.implementation == - (void (**)(void)) &drm_buffer_interface; -} - -uint32_t -wayland_drm_buffer_get_format(struct wl_buffer *buffer_base) -{ - struct wl_drm_buffer *buffer = (struct wl_drm_buffer *) buffer_base; - - return buffer->format; -} - -void * -wayland_drm_buffer_get_buffer(struct wl_buffer *buffer_base) -{ - struct wl_drm_buffer *buffer = (struct wl_drm_buffer *) buffer_base; - - return buffer->driver_buffer; -}