diff options
Diffstat (limited to 'src/egl/wayland')
| -rw-r--r-- | src/egl/wayland/Makefile | 18 | ||||
| -rw-r--r-- | src/egl/wayland/wayland-drm/.gitignore | 3 | ||||
| -rw-r--r-- | src/egl/wayland/wayland-drm/Makefile | 45 | ||||
| -rw-r--r-- | src/egl/wayland/wayland-drm/protocol/wayland-drm.xml | 38 | ||||
| -rw-r--r-- | src/egl/wayland/wayland-drm/wayland-drm.c | 203 | ||||
| -rw-r--r-- | src/egl/wayland/wayland-drm/wayland-drm.h | 26 | ||||
| -rw-r--r-- | src/egl/wayland/wayland-egl.c | 4 |
7 files changed, 332 insertions, 5 deletions
diff --git a/src/egl/wayland/Makefile b/src/egl/wayland/Makefile index 4cd036519db..3499aef0486 100644 --- a/src/egl/wayland/Makefile +++ b/src/egl/wayland/Makefile @@ -1,4 +1,4 @@ -# src/egl/main/Makefile +# src/egl/wayland/Makefile TOP = ../../.. include $(TOP)/configs/current @@ -10,14 +10,20 @@ SOURCES = wayland-egl.c OBJECTS = $(SOURCES:.c=.o) -LOCAL_CFLAGS = -I$(TOP)/include/EGL $(LIBDRM_CFLAGS) $(WAYLAND_CFLAGS) +LOCAL_CFLAGS = -I$(TOP)/include/EGL \ + -I$(TOP)/src/egl/wayland/wayland-drm \ + $(LIBDRM_CFLAGS) \ + $(WAYLAND_CFLAGS) + LOCAL_LIBS = +SUBDIRS = wayland-drm + .c.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@ -default: depend library +default: depend subdirs library # wayland-egl Library library: $(TOP)/$(LIB_DIR)/$(WAYLAND_EGL_LIB_NAME) @@ -54,6 +60,12 @@ clean: -rm -f *.o -rm -f depend depend.bak +subdirs: + @for dir in $(SUBDIRS) ; do \ + if [ -d $$dir ] ; then \ + (cd $$dir && $(MAKE)) || exit 1 ; \ + fi \ + done depend: $(SOURCES) $(HEADERS) @ echo "running $(MKDEP)" diff --git a/src/egl/wayland/wayland-drm/.gitignore b/src/egl/wayland/wayland-drm/.gitignore new file mode 100644 index 00000000000..f4ed848476f --- /dev/null +++ b/src/egl/wayland/wayland-drm/.gitignore @@ -0,0 +1,3 @@ +wayland-drm-client-protocol.h +wayland-drm-server-protocol.h +wayland-drm-protocol.c diff --git a/src/egl/wayland/wayland-drm/Makefile b/src/egl/wayland/wayland-drm/Makefile new file mode 100644 index 00000000000..c232769697a --- /dev/null +++ b/src/egl/wayland/wayland-drm/Makefile @@ -0,0 +1,45 @@ +# src/egl/wayland/wayland-drm/Makefile + +TOP = ../../../.. +include $(TOP)/configs/current + +GEN_SOURCES = wayland-drm-protocol.c + +GEN_HEADERS = wayland-drm-client-protocol.h wayland-drm-server-protocol.h + +wayland_drm_SOURCES = wayland-drm.c $(GEN_SOURCES) +wayland_drm_OBJECTS = $(wayland_drm_SOURCES:.c=.o) + +wayland_drm_INCLUDES = \ + $(WAYLAND_CFLAGS) \ + -I$(TOP)/src/egl/main + +# Generate protocol sources +prefix=$(shell pkg-config --variable=prefix wayland-server) +exec_prefx=$(shell pkg-config --variable=exec_prefix wayland-server) +wayland_protocoldir = $(PWD)/protocol +wayland_scanner=$(exec_prefix)/bin/wayland-scanner + +default: depend libwayland-drm.a $(GEN_SOURCES) $(GEN_HEADERS) + +libwayland-drm.a: $(wayland_drm_OBJECTS) Makefile + $(MKLIB) -o wayland-drm -static $(wayland_drm_OBJECTS) + +depend: + rm -f depend + touch depend + $(MKDEP) $(MKDEP_OPTIONS) $(wayland_drm_INCLUDES) $(wayland_drm_SOURCES) 2> /dev/null + +clean: + rm -rf libwayland-drm.a $(wayland_drm_OBJECTS) \ + $(GEN_SOURCES) $(GEN_HEADERS) + +install: + @echo -n "" + +$(wayland_drm_OBJECTS): %.o: %.c $(GEN_HEADERS) + $(CC) -c $(wayland_drm_INCLUDES) $(CFLAGS) $< -o $@ + +include $(prefix)/share/aclocal/wayland-scanner.mk + +sinclude depend diff --git a/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml b/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml new file mode 100644 index 00000000000..46725d85179 --- /dev/null +++ b/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<protocol name="drm"> + <!-- drm support. This object is created by the server and published + using the display's global event. --> + <interface name="drm" version="1"> + <!-- Call this request with the magic received from drmGetMagic(). + It will be passed on to the drmAuthMagic() or + DRIAuthConnection() call. This authentication must be + completed before create_buffer could be used. --> + <request name="authenticate"> + <arg name="id" type="uint"/> + </request> + + <!-- Create a wayland buffer for the named DRM buffer. The DRM + surface must have a name using the flink ioctl --> + <request name="create_buffer"> + <arg name="id" type="new_id" interface="buffer"/> + <arg name="name" type="uint"/> + <arg name="width" type="int"/> + <arg name="height" type="int"/> + <arg name="stride" type="uint"/> + <arg name="visual" type="object" interface="visual"/> + </request> + + <!-- Notification of the path of the drm device which is used by + the server. The client should use this device for creating + local buffers. Only buffers created from this device should + be be passed to the server using this drm object's + create_buffer request. --> + <event name="device"> + <arg name="name" type="string"/> + </event> + + <!-- Raised if the authenticate request succeeded --> + <event name="authenticated"/> + </interface> + +</protocol> diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c b/src/egl/wayland/wayland-drm/wayland-drm.c new file mode 100644 index 00000000000..6624fbe9d4e --- /dev/null +++ b/src/egl/wayland/wayland-drm/wayland-drm.c @@ -0,0 +1,203 @@ +/* + * Copyright © 2011 Kristian Høgsberg + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Authors: + * Kristian Høgsberg <krh@bitplanet.net> + * Benjamin Franzke <benjaminfranzke@googlemail.com> + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <stddef.h> + +#include <wayland-server.h> +#include "wayland-drm.h" +#include "wayland-drm-server-protocol.h" + +#include "egldisplay.h" +#include "egldriver.h" +#include "eglimage.h" +#include "egltypedefs.h" + +struct wl_drm { + struct wl_object object; + struct wl_display *display; + + _EGLDisplay *edisp; + + char *device_name; + authenticate_t authenticate; +}; + +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) +{ +} + +static void +destroy_buffer(struct wl_resource *resource, struct wl_client *client) +{ + 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); +} + +static void +buffer_destroy(struct wl_client *client, struct wl_buffer *buffer) +{ + wl_resource_destroy(&buffer->resource, client); +} + +const static struct wl_buffer_interface buffer_interface = { + buffer_destroy +}; + +static void +drm_create_buffer(struct wl_client *client, struct wl_drm *drm, + uint32_t id, uint32_t name, int32_t width, int32_t height, + uint32_t stride, struct wl_visual *visual) +{ + 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); + if (buffer == NULL) { + wl_client_post_no_memory(client); + 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); + 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.destroy = destroy_buffer; + + wl_client_add_resource(client, &buffer->buffer.resource); +} + +static void +drm_authenticate(struct wl_client *client, + struct wl_drm *drm, 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); + else + wl_client_post_event(client, &drm->object, + WL_DRM_AUTHENTICATED); +} + +const static struct wl_drm_interface drm_interface = { + drm_authenticate, + drm_create_buffer +}; + +static void +post_drm_device(struct wl_client *client, struct wl_object *global) +{ + struct wl_drm *drm = (struct wl_drm *) global; + + wl_client_post_event(client, global, WL_DRM_DEVICE, drm->device_name); +} + +struct wl_drm * +wayland_drm_init(struct wl_display *display, _EGLDisplay *disp, + authenticate_t authenticate, char *device_name) +{ + struct wl_drm *drm; + + drm = malloc(sizeof *drm); + + drm->display = display; + drm->edisp = disp; + drm->authenticate = authenticate; + drm->device_name = strdup(device_name); + + 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); + + return drm; +} + +void +wayland_drm_destroy(struct wl_drm *drm) +{ + free(drm->device_name); + + /* FIXME: need wl_display_del_{object,global} */ + + free(drm); +} diff --git a/src/egl/wayland/wayland-drm/wayland-drm.h b/src/egl/wayland/wayland-drm/wayland-drm.h new file mode 100644 index 00000000000..675a6a5ce43 --- /dev/null +++ b/src/egl/wayland/wayland-drm/wayland-drm.h @@ -0,0 +1,26 @@ +#ifndef WAYLAND_DRM_H +#define WAYLAND_DRM_H + +#include "egldisplay.h" +#include "eglimage.h" + +#include <wayland-server.h> + +struct wl_drm; + +typedef int (*authenticate_t) (_EGLDisplay *disp, uint32_t id); + +struct wl_drm_buffer { + struct wl_buffer buffer; + struct wl_drm *drm; + _EGLImage *image; +}; + +struct wl_drm * +wayland_drm_init(struct wl_display *display, _EGLDisplay *disp, + authenticate_t authenticate, char *device_name); + +void +wayland_drm_destroy(struct wl_drm *drm); + +#endif diff --git a/src/egl/wayland/wayland-egl.c b/src/egl/wayland/wayland-egl.c index 12fbdfa29c1..2c84bec64a5 100644 --- a/src/egl/wayland/wayland-egl.c +++ b/src/egl/wayland/wayland-egl.c @@ -12,10 +12,10 @@ #include <dlfcn.h> #include <wayland-client.h> -#include <xf86drm.h> - #include "wayland-egl.h" #include "wayland-egl-priv.h" +#include "wayland-drm-client-protocol.h" +#include <xf86drm.h> static void drm_handle_device(void *data, struct wl_drm *drm, const char *device) |