summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2011-04-29 22:14:54 +0200
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2011-04-29 22:20:25 +0200
commitd59eb1c3aac86fb3f4eddfb679fcab06354db487 (patch)
treea0505f32e8125a1c4fcc2ac052ceb2ad82db9db8
parent48d49eb5f928f3e9d120e6a292caf872d358967a (diff)
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.
-rw-r--r--compositor/compositor-drm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/compositor/compositor-drm.c b/compositor/compositor-drm.c
index c7c0180..fe4d85f 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;