/*
* Copyright © 2011 Kristian Høgsberg
+ * Copyright © 2011 Benjamin Franzke
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
#include "wayland-drm.h"
#include "wayland-drm-server-protocol.h"
-#include "egldisplay.h"
-#include "egldriver.h"
-#include "eglimage.h"
-#include "egltypedefs.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_object object;
struct wl_display *display;
- _EGLDisplay *edisp;
-
+ void *user_data;
char *device_name;
- authenticate_t authenticate;
+
+ struct wayland_drm_callbacks *callbacks;
};
static void
-drm_buffer_damage(struct wl_buffer *buffer_base,
- struct wl_surface *surface,
- int32_t x, int32_t y, int32_t width, int32_t height)
+destroy_buffer(struct wl_resource *resource)
{
+ struct wl_drm_buffer *buffer = resource->data;
+ struct wl_drm *drm = buffer->drm;
+
+ drm->callbacks->release_buffer(drm->user_data, buffer);
+ free(buffer);
}
static void
-destroy_buffer(struct wl_resource *resource, struct wl_client *client)
+buffer_destroy(struct wl_client *client, struct wl_resource *resource)
{
- struct wl_drm_buffer *buffer = (struct wl_drm_buffer *) resource;
- _EGLDriver *drv = buffer->drm->edisp->Driver;
-
- drv->API.DestroyImageKHR(drv, buffer->drm->edisp, buffer->image);
- free(buffer);
+#ifdef HAS_WAYLAND_0_85
+ wl_resource_destroy(resource, 0);
+#else
+ wl_resource_destroy(resource);
+#endif
}
+#ifdef HAS_WAYLAND_0_85
static void
-buffer_destroy(struct wl_client *client, struct wl_buffer *buffer)
+buffer_damage(struct wl_client *client, struct wl_resource *buffer,
+ int32_t x, int32_t y, int32_t width, int32_t height)
{
- wl_resource_destroy(&buffer->resource, client);
}
+#endif
-const static struct wl_buffer_interface buffer_interface = {
+const static struct wl_buffer_interface drm_buffer_interface = {
+#ifdef HAS_WAYLAND_0_85
+ buffer_damage,
+#endif
buffer_destroy
};
static void
-drm_create_buffer(struct wl_client *client, struct wl_drm *drm,
+drm_create_buffer(struct wl_client *client, struct wl_resource *resource,
uint32_t id, uint32_t name, int32_t width, int32_t height,
- uint32_t stride, struct wl_visual *visual)
+ uint32_t stride, uint32_t format)
{
+ struct wl_drm *drm = resource->data;
struct wl_drm_buffer *buffer;
- EGLint attribs[] = {
- EGL_WIDTH, 0,
- EGL_HEIGHT, 0,
- EGL_DRM_BUFFER_STRIDE_MESA, 0,
- EGL_DRM_BUFFER_FORMAT_MESA, EGL_DRM_BUFFER_FORMAT_ARGB32_MESA,
- EGL_NONE
- };
- _EGLDriver *drv = drm->edisp->Driver;
-
- buffer = malloc(sizeof *buffer);
+
+ switch (format) {
+ case WL_DRM_FORMAT_ARGB8888:
+ case WL_DRM_FORMAT_XRGB8888:
+ break;
+ default:
+ wl_resource_post_error(resource,
+ WL_DRM_ERROR_INVALID_FORMAT,
+ "invalid format");
+ return;
+ }
+
+ buffer = calloc(1, sizeof *buffer);
if (buffer == NULL) {
- wl_client_post_no_memory(client);
+ wl_resource_post_no_memory(resource);
return;
}
buffer->drm = drm;
- buffer->buffer.compositor = NULL;
buffer->buffer.width = width;
buffer->buffer.height = height;
- buffer->buffer.visual = visual;
- buffer->buffer.attach = NULL;
- buffer->buffer.damage = drm_buffer_damage;
-
- if (visual->object.interface != &wl_visual_interface) {
- /* FIXME: Define a real exception event instead of
- * abusing this one */
- wl_client_post_event(client,
- (struct wl_object *) drm->display,
- WL_DISPLAY_INVALID_OBJECT, 0);
- fprintf(stderr, "invalid visual in create_buffer\n");
- return;
- }
-
- attribs[1] = width;
- attribs[3] = height;
- attribs[5] = stride / 4;
- buffer->image = drv->API.CreateImageKHR(drv, drm->edisp,
- EGL_NO_CONTEXT,
- EGL_DRM_BUFFER_MESA,
- (EGLClientBuffer) (intptr_t) name,
- attribs);
-
- if (buffer->image == NULL) {
- /* FIXME: Define a real exception event instead of
- * abusing this one */
- wl_client_post_event(client,
- (struct wl_object *) drm->display,
- WL_DISPLAY_INVALID_OBJECT, 0);
- fprintf(stderr, "failed to create image for name %d\n", name);
+ buffer->format = format;
+ buffer->offset0 = 0;
+ buffer->stride0 = stride;
+
+ drm->callbacks->reference_buffer(drm->user_data, name, buffer);
+ if (buffer->driver_buffer == NULL) {
+ wl_resource_post_error(resource,
+ WL_DRM_ERROR_INVALID_NAME,
+ "invalid name");
return;
}
buffer->buffer.resource.object.id = id;
buffer->buffer.resource.object.interface = &wl_buffer_interface;
- buffer->buffer.resource.object.implementation = (void (**)(void))
- &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;
- wl_client_add_resource(client, &buffer->buffer.resource);
+ wl_client_add_resource(resource->client, &buffer->buffer.resource);
}
static void
drm_authenticate(struct wl_client *client,
- struct wl_drm *drm, uint32_t id)
+ struct wl_resource *resource, uint32_t id)
{
- if (drm->authenticate(drm->edisp, id) < 0)
- wl_client_post_event(client,
- (struct wl_object *) drm->display,
- WL_DISPLAY_INVALID_OBJECT, 0);
+ struct wl_drm *drm = resource->data;
+
+ if (drm->callbacks->authenticate(drm->user_data, id) < 0)
+ wl_resource_post_error(resource,
+ WL_DRM_ERROR_AUTHENTICATE_FAIL,
+ "authenicate failed");
else
- wl_client_post_event(client, &drm->object,
- WL_DRM_AUTHENTICATED);
+ wl_resource_post_event(resource, WL_DRM_AUTHENTICATED);
}
const static struct wl_drm_interface drm_interface = {
};
static void
-post_drm_device(struct wl_client *client, struct wl_object *global)
+bind_drm(struct wl_client *client, void *data, uint32_t version, uint32_t id)
{
- struct wl_drm *drm = (struct wl_drm *) global;
-
- wl_client_post_event(client, global, WL_DRM_DEVICE, drm->device_name);
+ struct wl_drm *drm = data;
+ struct wl_resource *resource;
+
+ resource = wl_client_add_object(client, &wl_drm_interface,
+ &drm_interface, id, data);
+ wl_resource_post_event(resource, WL_DRM_DEVICE, drm->device_name);
+ wl_resource_post_event(resource, WL_DRM_FORMAT,
+ WL_DRM_FORMAT_ARGB8888);
+ wl_resource_post_event(resource, WL_DRM_FORMAT,
+ WL_DRM_FORMAT_XRGB8888);
}
struct wl_drm *
-wayland_drm_init(struct wl_display *display, _EGLDisplay *disp,
- authenticate_t authenticate, char *device_name)
+wayland_drm_init(struct wl_display *display, char *device_name,
+ struct wayland_drm_callbacks *callbacks, void *user_data)
{
struct wl_drm *drm;
drm = malloc(sizeof *drm);
drm->display = display;
- drm->edisp = disp;
- drm->authenticate = authenticate;
drm->device_name = strdup(device_name);
+ drm->callbacks = callbacks;
+ drm->user_data = user_data;
- drm->object.interface = &wl_drm_interface;
- drm->object.implementation = (void (**)(void)) &drm_interface;
- wl_display_add_object(display, &drm->object);
- wl_display_add_global(display, &drm->object, post_drm_device);
+ wl_display_add_global(display, &wl_drm_interface, drm, bind_drm);
return drm;
}
void
-wayland_drm_destroy(struct wl_drm *drm)
+wayland_drm_uninit(struct wl_drm *drm)
{
free(drm->device_name);
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;
+}
projects / mesa.git / blobdiff