#include <xf86drm.h>
#include <xf86drmMode.h>
+#include <gbm.h>
+
#include "compositor.h"
struct drm_compositor {
struct {
int fd;
} drm;
+ struct gbm_device *gbm;
uint32_t crtc_allocator;
uint32_t connector_allocator;
struct tty *tty;
-
- PFNEGLCREATEDRMIMAGEMESA create_drm_image;
- PFNEGLEXPORTDRMIMAGEMESA export_drm_image;
};
struct drm_mode {
GLuint rbo[2];
uint32_t fb_id[2];
EGLImageKHR image[2];
+ struct gbm_bo *bo[2];
uint32_t current;
struct wlsc_surface *scanout_surface;
EGLint handle, stride;
int ret;
uint32_t fb_id = 0;
+ struct gbm_bo *bo;
if (es->x != output->base.x ||
es->y != output->base.y ||
es->image == EGL_NO_IMAGE_KHR)
return -1;
- c->export_drm_image(c->base.display,
- es->image, NULL, &handle, &stride);
+ bo = gbm_bo_create_from_egl_image(c->gbm,
+ c->base.display, es->image,
+ es->width, es->height,
+ GBM_BO_USE_SCANOUT);
+
+ handle = gbm_bo_get_handle(bo).s32;
+ stride = gbm_bo_get_pitch(bo);
+
+ gbm_bo_destroy(bo);
if (handle == 0)
return -1;
EGLint handle, stride;
int ret = -1;
pixman_region32_t cursor_region;
+ struct gbm_bo *bo;
if (eid == NULL) {
drmModeSetCursor(c->drm.fd, output->crtc_id, 0, 0, 0);
output->base.current->width,
output->base.current->height);
- if (!pixman_region32_not_empty(&cursor_region)) {
- ret = 0;
+ if (!pixman_region32_not_empty(&cursor_region))
goto out;
- }
if (eid->sprite->image == EGL_NO_IMAGE_KHR)
goto out;
if (eid->sprite->width > 64 || eid->sprite->height > 64)
goto out;
- c->export_drm_image(c->base.display, eid->sprite->image,
- NULL, &handle, &stride);
+ bo = gbm_bo_create_from_egl_image(c->gbm,
+ c->base.display,
+ eid->sprite->image, 64, 64,
+ GBM_BO_USE_CURSOR_64X64);
+
+ handle = gbm_bo_get_handle(bo).s32;
+ stride = gbm_bo_get_pitch(bo);
+
+ gbm_bo_destroy(bo);
if (stride != 64 * 4) {
fprintf(stderr, "info: cursor stride is != 64\n");
goto out;
}
- printf("info: set hardware cursor\n");
-
out:
pixman_region32_fini(&cursor_region);
if (ret)
setenv("EGL_PLATFORM", "drm", 1);
ec->drm.fd = fd;
- ec->base.display = eglGetDisplay(FD_TO_EGL_NATIVE_DPY(ec->drm.fd));
+ ec->gbm = gbm_create_device(ec->drm.fd);
+ ec->base.display = eglGetDisplay(ec->gbm);
if (ec->base.display == NULL) {
fprintf(stderr, "failed to create display\n");
return -1;
struct drm_mode *drm_mode;
drmModeEncoder *encoder;
int i, ret;
- EGLint handle, stride, attribs[] = {
- EGL_WIDTH, 0,
- EGL_HEIGHT, 0,
- EGL_DRM_BUFFER_FORMAT_MESA, EGL_DRM_BUFFER_FORMAT_ARGB32_MESA,
- EGL_DRM_BUFFER_USE_MESA, EGL_DRM_BUFFER_USE_SCANOUT_MESA,
- EGL_NONE
- };
+ unsigned handle, stride;
encoder = drmModeGetEncoder(ec->drm.fd, connector->encoders[0]);
if (encoder == NULL) {
return -1;
memset(output, 0, sizeof *output);
- output->base.x = x;
- output->base.y = y;
- output->base.mm_width = connector->mmWidth;
- output->base.mm_height = connector->mmHeight;
output->base.subpixel = drm_subpixel_to_wayland(connector->subpixel);
output->base.make = "unknown";
output->base.model = "unknown";
drm_mode->base.flags =
WL_OUTPUT_MODE_CURRENT | WL_OUTPUT_MODE_PREFERRED;
- wlsc_output_init(&output->base, &ec->base, x, y, 200, 100, 0);
+ wlsc_output_init(&output->base, &ec->base, x, y,
+ connector->mmWidth, connector->mmHeight, 0);
wl_list_insert(ec->base.output_list.prev, &output->base.link);
for (i = 0; i < 2; i++) {
glBindRenderbuffer(GL_RENDERBUFFER, output->rbo[i]);
- attribs[1] = output->base.current->width;
- attribs[3] = output->base.current->height;
- output->image[i] =
- ec->create_drm_image(ec->base.display, attribs);
+ output->bo[i] =
+ gbm_bo_create(ec->gbm,
+ output->base.current->width,
+ output->base.current->height,
+ GBM_BO_FORMAT_XRGB8888,
+ GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
+ output->image[i] = ec->base.create_image(ec->base.display,
+ NULL,
+ EGL_NATIVE_PIXMAP_KHR,
+ output->bo[i], NULL);
+
+
ec->base.image_target_renderbuffer_storage(GL_RENDERBUFFER,
output->image[i]);
- ec->export_drm_image(ec->base.display, output->image[i],
- NULL, &handle, &stride);
+ stride = gbm_bo_get_pitch(output->bo[i]);
+ handle = gbm_bo_get_handle(output->bo[i]).u32;
ret = drmModeAddFB(ec->drm.fd,
output->base.current->width,
if (connector->connection == DRM_MODE_CONNECTED &&
(option_connector == 0 ||
- connector->connector_id == option_connector))
+ connector->connector_id == option_connector)) {
if (create_output_for_connector(ec, resources,
connector, x, y) < 0)
return -1;
- x += container_of(ec->base.output_list.prev, struct wlsc_output,
- link)->current->width;
+ x += container_of(ec->base.output_list.prev,
+ struct wlsc_output,
+ link)->current->width;
+ }
drmModeFreeConnector(connector);
}
drm_compositor_create_cursor_image(struct wlsc_compositor *ec,
int32_t width, int32_t height)
{
- static const EGLint image_attribs[] = {
- EGL_WIDTH, 64,
- EGL_HEIGHT, 64,
- EGL_DRM_BUFFER_FORMAT_MESA, EGL_DRM_BUFFER_FORMAT_ARGB32_MESA,
- EGL_DRM_BUFFER_USE_MESA, EGL_DRM_BUFFER_USE_CURSOR_MESA,
- EGL_NONE
- };
struct drm_compositor *c = (struct drm_compositor *) ec;
+ struct gbm_bo *bo;
+ EGLImageKHR image;
+ uint32_t *pixels;
+ GLuint tex;
if (width > 64 || height > 64)
return EGL_NO_IMAGE_KHR;
- return c->create_drm_image(ec->display, image_attribs);
+ bo = gbm_bo_create(c->gbm,
+ /* width, height, */ 64, 64,
+ GBM_BO_FORMAT_ARGB8888,
+ GBM_BO_USE_CURSOR_64X64 | GBM_BO_USE_RENDERING);
+
+ image = ec->create_image(c->base.display, NULL,
+ EGL_NATIVE_PIXMAP_KHR, bo, NULL);
+ gbm_bo_destroy(bo);
+
+ /* If the requested size is smaller than the allocated one, make the
+ * whole image transparent. */
+ if (width != 64 || height != 64) {
+ pixels = calloc(64 * 64, sizeof *pixels);
+
+ glGenTextures(1, &tex);
+ glBindTexture(GL_TEXTURE_2D, tex);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+ c->base.image_target_texture_2d(GL_TEXTURE_2D, image);
+ glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 64, 64,
+ GL_BGRA_EXT, GL_UNSIGNED_BYTE, pixels);
+
+ glDeleteTextures(1, &tex);
+ free(pixels);
+ }
+
+ return image;
}
static void
};
}
+static const char default_seat[] = "seat0";
+
static struct wlsc_compositor *
-drm_compositor_create(struct wl_display *display, int connector)
+drm_compositor_create(struct wl_display *display,
+ int connector, const char *seat)
{
struct drm_compositor *ec;
struct udev_enumerate *e;
struct udev_list_entry *entry;
- struct udev_device *device;
- const char *path;
+ struct udev_device *device, *drm_device;
+ const char *path, *device_seat;
struct wl_event_loop *loop;
ec = malloc(sizeof *ec);
e = udev_enumerate_new(ec->udev);
udev_enumerate_add_match_subsystem(e, "drm");
- udev_enumerate_add_match_property(e, "WAYLAND_SEAT", "1");
+
udev_enumerate_scan_devices(e);
- device = NULL;
+ drm_device = NULL;
udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(e)) {
path = udev_list_entry_get_name(entry);
device = udev_device_new_from_syspath(ec->udev, path);
- break;
+ device_seat =
+ udev_device_get_property_value(device, "ID_SEAT");
+ if (!device_seat)
+ device_seat = default_seat;
+ if (strcmp(device_seat, seat) == 0) {
+ drm_device = device;
+ break;
+ }
+ udev_device_unref(device);
}
+
udev_enumerate_unref(e);
- if (device == NULL) {
+ if (drm_device == NULL) {
fprintf(stderr, "no drm device found\n");
return NULL;
}
ec->base.wl_display = display;
- if (init_egl(ec, device) < 0) {
+ if (init_egl(ec, drm_device) < 0) {
fprintf(stderr, "failed to initialize egl\n");
return NULL;
}
+ udev_device_unref(drm_device);
+
ec->base.destroy = drm_destroy;
ec->base.create_cursor_image = drm_compositor_create_cursor_image;
glGenFramebuffers(1, &ec->base.fbo);
glBindFramebuffer(GL_FRAMEBUFFER, ec->base.fbo);
- ec->create_drm_image =
- (void *) eglGetProcAddress("eglCreateDRMImageMESA");
- ec->export_drm_image =
- (void *) eglGetProcAddress("eglExportDRMImageMESA");
-
/* Can't init base class until we have a current egl context */
if (wlsc_compositor_init(&ec->base, display) < 0)
return NULL;
return NULL;
}
- evdev_input_add_devices(&ec->base, ec->udev);
+ evdev_input_add_devices(&ec->base, ec->udev, seat);
loop = wl_display_get_event_loop(ec->base.wl_display);
ec->drm_source =
backend_init(struct wl_display *display, char *options)
{
int connector = 0, i;
+ const char *seat;
char *p, *value;
- static char * const tokens[] = { "connector", NULL };
+ static char * const tokens[] = { "connector", "seat", NULL };
p = options;
+ seat = default_seat;
while (i = getsubopt(&p, tokens, &value), i != -1) {
switch (i) {
case 0:
connector = strtol(value, NULL, 0);
break;
+ case 1:
+ seat = value;
+ break;
}
}
- return drm_compositor_create(display, connector);
+ return drm_compositor_create(display, connector, seat);
}
projects / profile / ivi / weston.git / blobdiff