mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window.c: Include wayland-egl.h before EGL headers so we get the right platform

Browse Source
This commit is contained in:
Kristian Høgsberg 2011-02-09 10:51:15 -05:00
parent 43c63e59a7
commit 297d6dd442
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/simple-client.c
View File

@ -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);

6
clients/window.c
View File

@ -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;