From d59eb1c3aac86fb3f4eddfb679fcab06354db487 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Fri, 29 Apr 2011 22:14:54 +0200 Subject: [PATCH] compositor-drm: Retrieve extension functions before wlsc_compositor_init wlsc_compositor_init calls pointer_create, which calls create_cursor which needs EGL_MESA_drm_image functions. --- compositor/compositor-drm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compositor/compositor-drm.c b/compositor/compositor-drm.c index c7c01809..fe4d85f4 100644 --- a/compositor/compositor-drm.c +++ b/compositor/compositor-drm.c @@ -702,15 +702,15 @@ drm_compositor_create(struct wl_display *display, int connector) glGenFramebuffers(1, &ec->base.fbo); glBindFramebuffer(GL_FRAMEBUFFER, ec->base.fbo); - /* Can't init base class until we have a current egl context */ - if (wlsc_compositor_init(&ec->base, display) < 0) - return NULL; - 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; + if (create_outputs(ec, connector) < 0) { fprintf(stderr, "failed to create output for %s\n", path); return NULL;