From dca992a160977316d867996053c646bb5dace1e5 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Wed, 5 Mar 2014 01:33:26 +0000 Subject: [PATCH] egl: remove NativeWindowType/NativeDisplayType defines This ensures we use EGLNativeWindowType and EGLNativeDisplayType everywhere instead. The previous names come from EGL 1.2 but it seems reasonable to require more recent EGL versions. If someone wanted to add compatibility for EGL 1.2 later it would be straightforward to define the new names to the old. Reviewed-by: Neil Roberts --- cogl/cogl-defines.h.win32.in | 2 -- cogl/cogl-defines.h.win32_SDL.in | 2 -- cogl/cogl-egl.h | 3 --- cogl/winsys/cogl-winsys-egl-android.c | 2 +- cogl/winsys/cogl-winsys-egl-gdl.c | 2 +- cogl/winsys/cogl-winsys-egl-kms.c | 6 +++--- cogl/winsys/cogl-winsys-egl-null.c | 2 +- cogl/winsys/cogl-winsys-egl-x11.c | 6 +++--- 8 files changed, 9 insertions(+), 16 deletions(-) diff --git a/cogl/cogl-defines.h.win32.in b/cogl/cogl-defines.h.win32.in index 6fc38ada1..b484fd246 100644 --- a/cogl/cogl-defines.h.win32.in +++ b/cogl/cogl-defines.h.win32.in @@ -53,8 +53,6 @@ G_BEGIN_DECLS #include #else #include -#define NativeDisplayType EGLNativeDisplayType -#define NativeWindowType EGLNativeWindowType #endif #endif diff --git a/cogl/cogl-defines.h.win32_SDL.in b/cogl/cogl-defines.h.win32_SDL.in index e9ad2bfca..acd246b26 100644 --- a/cogl/cogl-defines.h.win32_SDL.in +++ b/cogl/cogl-defines.h.win32_SDL.in @@ -54,8 +54,6 @@ G_BEGIN_DECLS #include #else #include -#define NativeDisplayType EGLNativeDisplayType -#define NativeWindowType EGLNativeWindowType #endif #endif diff --git a/cogl/cogl-egl.h b/cogl/cogl-egl.h index 8eaba111f..96abb785f 100644 --- a/cogl/cogl-egl.h +++ b/cogl/cogl-egl.h @@ -37,9 +37,6 @@ COGL_BEGIN_DECLS -#define NativeDisplayType EGLNativeDisplayType -#define NativeWindowType EGLNativeWindowType - #ifndef GL_OES_EGL_image #define GLeglImageOES void * #endif diff --git a/cogl/winsys/cogl-winsys-egl-android.c b/cogl/winsys/cogl-winsys-egl-android.c index eae63acd0..cf4a133ec 100644 --- a/cogl/winsys/cogl-winsys-egl-android.c +++ b/cogl/winsys/cogl-winsys-egl-android.c @@ -130,7 +130,7 @@ _cogl_winsys_egl_context_created (CoglDisplay *display, egl_display->egl_surface = eglCreateWindowSurface (egl_renderer->edpy, egl_display->egl_config, - (NativeWindowType) android_native_window, + (EGLNativeWindowType) android_native_window, NULL); if (egl_display->egl_surface == EGL_NO_SURFACE) { diff --git a/cogl/winsys/cogl-winsys-egl-gdl.c b/cogl/winsys/cogl-winsys-egl-gdl.c index 75c87eeb4..e5a076544 100644 --- a/cogl/winsys/cogl-winsys-egl-gdl.c +++ b/cogl/winsys/cogl-winsys-egl-gdl.c @@ -137,7 +137,7 @@ _cogl_winsys_egl_context_created (CoglDisplay *display, egl_display->egl_surface = eglCreateWindowSurface (egl_renderer->edpy, egl_display->egl_config, - (NativeWindowType) display->gdl_plane, + (EGLNativeWindowType) display->gdl_plane, NULL); if (egl_display->egl_surface == EGL_NO_SURFACE) diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c index a3649e758..8c4176e9f 100644 --- a/cogl/winsys/cogl-winsys-egl-kms.c +++ b/cogl/winsys/cogl-winsys-egl-kms.c @@ -790,7 +790,7 @@ _cogl_winsys_egl_context_created (CoglDisplay *display, egl_display->dummy_surface = eglCreateWindowSurface (egl_renderer->edpy, egl_display->egl_config, - (NativeWindowType) kms_display->dummy_gbm_surface, + (EGLNativeWindowType) kms_display->dummy_gbm_surface, NULL); if (egl_display->dummy_surface == EGL_NO_SURFACE) { @@ -986,7 +986,7 @@ _cogl_winsys_onscreen_init (CoglOnscreen *onscreen, egl_onscreen->egl_surface = eglCreateWindowSurface (egl_renderer->edpy, egl_display->egl_config, - (NativeWindowType) kms_onscreen->surface, + (EGLNativeWindowType) kms_onscreen->surface, NULL); if (egl_onscreen->egl_surface == EGL_NO_SURFACE) { @@ -1172,7 +1172,7 @@ cogl_kms_display_set_layout (CoglDisplay *display, new_egl_surface = eglCreateWindowSurface (egl_renderer->edpy, egl_display->egl_config, - (NativeWindowType) new_surface, + (EGLNativeWindowType) new_surface, NULL); if (new_egl_surface == EGL_NO_SURFACE) { diff --git a/cogl/winsys/cogl-winsys-egl-null.c b/cogl/winsys/cogl-winsys-egl-null.c index d2548992b..962d6d1eb 100644 --- a/cogl/winsys/cogl-winsys-egl-null.c +++ b/cogl/winsys/cogl-winsys-egl-null.c @@ -96,7 +96,7 @@ _cogl_winsys_egl_context_created (CoglDisplay *display, egl_display->egl_surface = eglCreateWindowSurface (egl_renderer->edpy, egl_display->egl_config, - (NativeWindowType) NULL, + (EGLNativeWindowType) NULL, NULL); if (egl_display->egl_surface == EGL_NO_SURFACE) { diff --git a/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/winsys/cogl-winsys-egl-x11.c index 6236b3b4a..5d2a858e5 100644 --- a/cogl/winsys/cogl-winsys-egl-x11.c +++ b/cogl/winsys/cogl-winsys-egl-x11.c @@ -278,7 +278,7 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer, goto error; egl_renderer->edpy = - eglGetDisplay ((NativeDisplayType) xlib_renderer->xdpy); + eglGetDisplay ((EGLNativeDisplayType) xlib_renderer->xdpy); if (!_cogl_winsys_egl_renderer_connect_common (renderer, error)) goto error; @@ -481,7 +481,7 @@ _cogl_winsys_egl_onscreen_init (CoglOnscreen *onscreen, egl_onscreen->egl_surface = eglCreateWindowSurface (egl_renderer->edpy, egl_config, - (NativeWindowType) xlib_onscreen->xwin, + (EGLNativeWindowType) xlib_onscreen->xwin, NULL); return TRUE; @@ -629,7 +629,7 @@ _cogl_winsys_egl_context_created (CoglDisplay *display, egl_display->dummy_surface = eglCreateWindowSurface (egl_renderer->edpy, egl_display->egl_config, - (NativeWindowType) xlib_display->dummy_xwin, + (EGLNativeWindowType) xlib_display->dummy_xwin, NULL); if (egl_display->dummy_surface == EGL_NO_SURFACE)