egl: fix _eglMatchDriver() return type

[mesa.git] / src / egl / wayland / wayland-drm / wayland-drm.c

diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c b/src/egl/wayland/wayland-drm/wayland-drm.c
index 2f5acb217d1d4071f89c212d5506e347198de3d6..51cdd2cb845bcebc490e27297ab961c68c750a1b 100644 (file)
--- a/src/egl/wayland/wayland-drm/wayland-drm.c
+++ b/src/egl/wayland/wayland-drm/wayland-drm.c
@@ -39,26 +39,13 @@
 
 #define MIN(x,y) (((x)<(y))?(x):(y))
 
-struct wl_drm {
-       struct wl_display *display;
-       struct wl_global *wl_drm_global;
-
-       void *user_data;
-       char *device_name;
-        uint32_t flags;
-
-       struct wayland_drm_callbacks *callbacks;
-
-        struct wl_buffer_interface buffer_interface;
-};
-
 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);
 }
 
@@ -77,7 +64,7 @@ create_buffer(struct wl_client *client, struct wl_resource *resource,
               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);
@@ -97,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, fd, 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,
@@ -124,6 +111,10 @@ 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:
@@ -187,9 +178,9 @@ 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");
@@ -197,7 +188,7 @@ 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,
@@ -221,6 +212,31 @@ bind_drm(struct wl_client *client, void *data, uint32_t version, uint32_t id)
        wl_resource_set_implementation(resource, &drm_interface, data, NULL);
 
        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,
@@ -244,33 +260,20 @@ bind_drm(struct wl_client *client, void *data, uint32_t version, uint32_t id)
            wl_resource_post_event(resource, WL_DRM_CAPABILITIES, capabilities);
 }
 
-struct wl_drm_buffer *
-wayland_drm_buffer_get(struct wl_drm *drm, struct wl_resource *resource)
-{
-       struct wl_drm_buffer *buffer;
-
-       if (resource == NULL)
-               return NULL;
-
-        if (wl_resource_instance_of(resource, &wl_buffer_interface,
-                                    &drm->buffer_interface))
-               return wl_resource_get_user_data(resource);
-        else
-               return NULL;
-}
-
 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;
 
@@ -292,15 +295,3 @@ wayland_drm_uninit(struct wl_drm *drm)
 
        free(drm);
 }
-
-uint32_t
-wayland_drm_buffer_get_format(struct wl_drm_buffer *buffer)
-{
-       return buffer->format;
-}
-
-void *
-wayland_drm_buffer_get_buffer(struct wl_drm_buffer *buffer)
-{
-       return buffer->driver_buffer;
-}