diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2011-02-09 10:51:15 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-02-09 10:51:15 -0500 |
| commit | 297d6dd4423611722d119d9e81970d2e8a600fd0 (patch) | |
| tree | 9b3b4eba0bc100a7a2f83a94aaa5a7739fc87256 | |
| parent | 43c63e59a722a7dd2c7deab036fe840c483ccac3 (diff) | |
window.c: Include wayland-egl.h before EGL headers so we get the right platform
| -rw-r--r-- | clients/simple-client.c | 4 | ||||
| -rw-r--r-- | clients/window.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/clients/simple-client.c b/clients/simple-client.c index 23d4b00..89718df 100644 --- a/clients/simple-client.c +++ b/clients/simple-client.c @@ -105,7 +105,7 @@ init_egl(struct display *display) EGLBoolean ret; display->egl.dpy = - eglGetDisplay((EGLNativeDisplayType) display->native); + eglGetDisplay(display->native); assert(display->egl.dpy); ret = eglInitialize(display->egl.dpy, &major, &minor); @@ -205,7 +205,7 @@ create_surface(struct window *window) window->egl_surface = eglCreateWindowSurface(display->egl.dpy, display->egl.conf, - (EGLNativeWindowType) window->native, + window->native, NULL); wl_surface_map_toplevel(window->surface); diff --git a/clients/window.c b/clients/window.c index b802518..f495476 100644 --- a/clients/window.c +++ b/clients/window.c @@ -36,6 +36,8 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <sys/mman.h> +#include <wayland-egl.h> + #define EGL_EGLEXT_PROTOTYPES 1 #define GL_GLEXT_PROTOTYPES 1 #include <GL/gl.h> @@ -48,8 +50,6 @@ #include <X11/extensions/XKBcommon.h> -#include <wayland-egl.h> - #include <linux/input.h> #include "wayland-util.h" #include "wayland-client.h" @@ -1593,7 +1593,7 @@ init_egl(struct display *d) { EGLint major, minor; - d->dpy = eglGetDisplay((EGLNativeDisplayType) d->native_dpy); + d->dpy = eglGetDisplay(d->native_dpy); if (!eglInitialize(d->dpy, &major, &minor)) { fprintf(stderr, "failed to initialize display\n"); return -1; |