diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2010-07-08 20:15:10 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-07-08 20:15:10 -0400 |
| commit | f252d6a98e75236a4059fb8ff6579ddad2e0e8aa (patch) | |
| tree | 2f97e9e73014bd634048f2019b3b4f5a25cafd48 /compositor-x11.c | |
| parent | Hide wayland cursor when X11 compositor loses focus (diff) | |
| download | wayland-f252d6a98e75236a4059fb8ff6579ddad2e0e8aa.tar wayland-f252d6a98e75236a4059fb8ff6579ddad2e0e8aa.tar.gz wayland-f252d6a98e75236a4059fb8ff6579ddad2e0e8aa.tar.bz2 wayland-f252d6a98e75236a4059fb8ff6579ddad2e0e8aa.tar.lz wayland-f252d6a98e75236a4059fb8ff6579ddad2e0e8aa.tar.xz wayland-f252d6a98e75236a4059fb8ff6579ddad2e0e8aa.tar.zst wayland-f252d6a98e75236a4059fb8ff6579ddad2e0e8aa.zip | |
Update to use eglGetDRMDisplayMESA()
Diffstat (limited to 'compositor-x11.c')
| -rw-r--r-- | compositor-x11.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/compositor-x11.c b/compositor-x11.c index 2ecd2a2..46f6a76 100644 --- a/compositor-x11.c +++ b/compositor-x11.c @@ -198,7 +198,6 @@ dri2_authenticate(struct x11_compositor *c) static int x11_compositor_init_egl(struct x11_compositor *c) { - PFNEGLGETTYPEDDISPLAYMESA get_typed_display_mesa; EGLint major, minor, count; EGLConfig config; @@ -211,7 +210,7 @@ x11_compositor_init_egl(struct x11_compositor *c) if (dri2_connect(c) < 0) return -1; - + c->drm_fd = open(c->base.base.device, O_RDWR); if (c->drm_fd == -1) { fprintf(stderr, @@ -223,16 +222,7 @@ x11_compositor_init_egl(struct x11_compositor *c) if (dri2_authenticate(c) < 0) return -1; - get_typed_display_mesa = - (PFNEGLGETTYPEDDISPLAYMESA) - eglGetProcAddress("eglGetTypedDisplayMESA"); - if (get_typed_display_mesa == NULL) { - fprintf(stderr, "eglGetTypedDisplayMESA() not found\n"); - return -1; - } - - c->base.display = get_typed_display_mesa(EGL_DRM_DISPLAY_TYPE_MESA, - (void *) c->drm_fd); + c->base.display = eglGetDRMDisplayMESA(c->drm_fd); if (c->base.display == NULL) { fprintf(stderr, "failed to create display\n"); return -1; |