[cogl/wip/expose-glx-egl-context-1.18: 1/3] egl: remove NativeWindowType/NativeDisplayType defines



commit c3be53b3ddb3a4e39753013d1ef56b39f6a64066
Author: Robert Bragg <robert linux intel com>
Date:   Wed Mar 5 01:33:26 2014 +0000

    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.
    
    (cherry picked from commit 8128e81df7d8c7f9ca6b2bb0aa58b449deaea615)

 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 6fc38ad..b484fd2 100644
--- a/cogl/cogl-defines.h.win32.in
+++ b/cogl/cogl-defines.h.win32.in
@@ -53,8 +53,6 @@ G_BEGIN_DECLS
 #include <GLES/egl.h>
 #else
 #include <EGL/egl.h>
-#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 e9ad2bf..acd246b 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 <GLES/egl.h>
 #else
 #include <EGL/egl.h>
-#define NativeDisplayType EGLNativeDisplayType
-#define NativeWindowType EGLNativeWindowType
 #endif
 #endif
 
diff --git a/cogl/cogl-egl.h b/cogl/cogl-egl.h
index 8eaba11..96abb78 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 eae63ac..cf4a133 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 75c87ee..e5a0765 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 4af9848..25d83c1 100644
--- a/cogl/winsys/cogl-winsys-egl-kms.c
+++ b/cogl/winsys/cogl-winsys-egl-kms.c
@@ -774,7 +774,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)
     {
@@ -970,7 +970,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)
     {
@@ -1145,7 +1145,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 d254899..962d6d1 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 6236b3b..5d2a858 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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]