Revert "wayland-drm: constify the callbacks struct"

[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 d317c5e1c460cf80dfbc128bf65068c23c97bc4b..2e256aea6d5d453396afa1f55c0eb12fbedc38b7 100644 (file)
--- a/src/egl/wayland/wayland-drm/wayland-drm.c
+++ b/src/egl/wayland/wayland-drm/wayland-drm.c
@@ -41,18 +41,21 @@
 
 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);
@@ -65,10 +68,6 @@ buffer_destroy(struct wl_client *client, struct wl_resource *resource)
        wl_resource_destroy(resource);
 }
 
-const static struct wl_buffer_interface drm_buffer_interface = {
-       buffer_destroy
-};
-
 static void
 create_buffer(struct wl_client *client, struct wl_resource *resource,
               uint32_t id, uint32_t name, int fd,
@@ -78,7 +77,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);
@@ -115,7 +114,7 @@ create_buffer(struct wl_client *client, struct wl_resource *resource,
        }
 
        wl_resource_set_implementation(buffer->resource,
-                                      (void (**)(void)) &drm_buffer_interface,
+                                      (void (**)(void)) &drm->buffer_interface,
                                       buffer, destroy_buffer);
 }
 
@@ -128,6 +127,7 @@ drm_create_buffer(struct wl_client *client, struct wl_resource *resource,
         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,
@@ -187,7 +187,7 @@ 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)
                wl_resource_post_error(resource,
@@ -197,7 +197,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,
@@ -225,6 +225,8 @@ bind_drm(struct wl_client *client, void *data, uint32_t version, uint32_t id)
                               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);
@@ -243,15 +245,15 @@ bind_drm(struct wl_client *client, void *data, uint32_t version, uint32_t id)
 }
 
 struct wl_drm_buffer *
-wayland_drm_buffer_get(struct wl_resource *resource)
+wayland_drm_buffer_get(struct wl_drm *drm, struct wl_resource *resource)
 {
        if (resource == NULL)
                return NULL;
 
-       if (wl_resource_instance_of(resource, &wl_buffer_interface,
-                                   &drm_buffer_interface))
+        if (wl_resource_instance_of(resource, &wl_buffer_interface,
+                                    &drm->buffer_interface))
                return wl_resource_get_user_data(resource);
-       else
+        else
                return NULL;
 }
 
@@ -263,6 +265,8 @@ wayland_drm_init(struct wl_display *display, char *device_name,
        struct wl_drm *drm;
 
        drm = malloc(sizeof *drm);
+       if (!drm)
+               return NULL;
 
        drm->display = display;
        drm->device_name = strdup(device_name);
@@ -270,7 +274,11 @@ wayland_drm_init(struct wl_display *display, char *device_name,
        drm->user_data = user_data;
         drm->flags = flags;
 
-       wl_global_create(display, &wl_drm_interface, 2, drm, bind_drm);
+        drm->buffer_interface.destroy = buffer_destroy;
+
+       drm->wl_drm_global =
+               wl_global_create(display, &wl_drm_interface, 2,
+                                drm, bind_drm);
 
        return drm;
 }
@@ -280,19 +288,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);
 }
-
-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;
-}