[cogl/wip/neil/master-next: 3/8] Rename the EGL_X11 winsys to EGL_XLIB

[Neil Roberts <nroberts src gnome org>]

commit b59db6ee43afaf8cf6916782fd2e1973e7ad2509
Author: Neil Roberts <neil linux intel com>
Date:   Tue Dec 13 16:23:25 2011 +0000

    Rename the EGL_X11 winsys to EGL_XLIB
    
    Eventually we might want to have an XCB-based EGL winsys. We already
    have xlib-specific API in CoglRenderer (eg, to set a foreign display)
    so the application needs to be able to specifically select between XCB
    and XLIB.
    
    This also removes the POWERVR part while renaming
    COGL_HAS_EGL_PLATFORM_POWERVR_X11_SUPPORT to
    COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT because the winsys is equally
    applicable to Mesa.

 cogl/Makefile.am                                   |    6 +++---
 cogl/cogl-renderer.c                               |    6 +++---
 cogl/cogl-renderer.h                               |    9 +++++++--
 ...11-private.h => cogl-winsys-egl-xlib-private.h} |    0
 ...ogl-winsys-egl-x11.c => cogl-winsys-egl-xlib.c} |    6 +++---
 configure.ac                                       |    4 ++--
 6 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 7deea82..4df8282 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -384,10 +384,10 @@ cogl_sources_c += \
 	$(srcdir)/winsys/cogl-winsys-egl-kms.c \
 	$(srcdir)/winsys/cogl-winsys-egl-kms-private.h
 endif
-if SUPPORT_EGL_PLATFORM_POWERVR_X11
+if SUPPORT_EGL_PLATFORM_XLIB
 cogl_sources_c += \
-	$(srcdir)/winsys/cogl-winsys-egl-x11.c \
-	$(srcdir)/winsys/cogl-winsys-egl-x11-private.h
+	$(srcdir)/winsys/cogl-winsys-egl-xlib.c \
+	$(srcdir)/winsys/cogl-winsys-egl-xlib-private.h
 endif
 if SUPPORT_EGL_PLATFORM_POWERVR_NULL
 cogl_sources_c += \
diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c
index 4157ac4..b9845c2 100644
--- a/cogl/cogl-renderer.c
+++ b/cogl/cogl-renderer.c
@@ -45,8 +45,8 @@
 #include "cogl-winsys-stub-private.h"
 #include "cogl-config-private.h"
 
-#ifdef COGL_HAS_EGL_PLATFORM_POWERVR_X11_SUPPORT
-#include "cogl-winsys-egl-x11-private.h"
+#ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
+#include "cogl-winsys-egl-xlib-private.h"
 #endif
 #ifdef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
 #include "cogl-winsys-egl-wayland-private.h"
@@ -82,7 +82,7 @@ static CoglWinsysVtableGetter _cogl_winsys_vtable_getters[] =
 #ifdef COGL_HAS_GLX_SUPPORT
   _cogl_winsys_glx_get_vtable,
 #endif
-#ifdef COGL_HAS_EGL_PLATFORM_POWERVR_X11_SUPPORT
+#ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
   _cogl_winsys_egl_x11_get_vtable,
 #endif
 #ifdef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
diff --git a/cogl/cogl-renderer.h b/cogl/cogl-renderer.h
index 9f225f2..e621b49 100644
--- a/cogl/cogl-renderer.h
+++ b/cogl/cogl-renderer.h
@@ -64,7 +64,12 @@ cogl_renderer_new (void);
  * @COGL_WINSYS_ID_ANY: Implies no preference for which backend is used
  * @COGL_WINSYS_ID_STUB: Use the no-op stub backend
  * @COGL_WINSYS_ID_GLX: Use the GLX window system binding API
- * @COGL_WINSYS_ID_EGL: Use the Khronos EGL window system binding API
+ * @COGL_WINSYS_ID_EGL_XLIB: Use EGL with the X window system via XLib
+ * @COGL_WINSYS_ID_EGL_NULL: Use EGL with the PowerVR NULL window system
+ * @COGL_WINSYS_ID_EGL_GDL: Use EGL with the GDL platform
+ * @COGL_WINSYS_ID_EGL_WAYLAND: Use EGL with the Wayland window system
+ * @COGL_WINSYS_ID_EGL_KMS: Use EGL with the KMS platform
+ * @COGL_WINSYS_ID_EGL_ANDROID: Use EGL with the Android platform
  * @COGL_WINSYS_ID_WGL: Use the Microsoft Windows WGL binding API
  *
  * Identifies specific window system backends that Cogl supports.
@@ -77,7 +82,7 @@ typedef enum
   COGL_WINSYS_ID_ANY,
   COGL_WINSYS_ID_STUB,
   COGL_WINSYS_ID_GLX,
-  COGL_WINSYS_ID_EGL_X11,
+  COGL_WINSYS_ID_EGL_XLIB,
   COGL_WINSYS_ID_EGL_NULL,
   COGL_WINSYS_ID_EGL_GDL,
   COGL_WINSYS_ID_EGL_WAYLAND,
diff --git a/cogl/winsys/cogl-winsys-egl-x11-private.h b/cogl/winsys/cogl-winsys-egl-xlib-private.h
similarity index 100%
rename from cogl/winsys/cogl-winsys-egl-x11-private.h
rename to cogl/winsys/cogl-winsys-egl-xlib-private.h
diff --git a/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/winsys/cogl-winsys-egl-xlib.c
similarity index 99%
rename from cogl/winsys/cogl-winsys-egl-x11.c
rename to cogl/winsys/cogl-winsys-egl-xlib.c
index 3a646e9..8dea09f 100644
--- a/cogl/winsys/cogl-winsys-egl-x11.c
+++ b/cogl/winsys/cogl-winsys-egl-xlib.c
@@ -31,7 +31,7 @@
 
 #include <X11/Xlib.h>
 
-#include "cogl-winsys-egl-x11-private.h"
+#include "cogl-winsys-egl-xlib-private.h"
 #include "cogl-winsys-egl-private.h"
 #include "cogl-xlib-renderer-private.h"
 #include "cogl-xlib-renderer.h"
@@ -694,8 +694,8 @@ _cogl_winsys_egl_x11_get_vtable (void)
 
       vtable = *_cogl_winsys_egl_get_vtable ();
 
-      vtable.id = COGL_WINSYS_ID_EGL_X11;
-      vtable.name = "EGL_X11";
+      vtable.id = COGL_WINSYS_ID_EGL_XLIB;
+      vtable.name = "EGL_XLIB";
 
       vtable.renderer_connect = _cogl_winsys_renderer_connect;
       vtable.renderer_disconnect = _cogl_winsys_renderer_disconnect;
diff --git a/configure.ac b/configure.ac
index 08ed636..9ce91eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -834,9 +834,9 @@ AS_IF([test "x$enable_xlib_egl_platform" = "xyes"],
         NEED_XLIB=yes
         EGL_PLATFORMS="$EGL_PLATFORMS xlib"
 
-        COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_POWERVR_X11_SUPPORT"
+        COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT"
       ])
-AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_X11,
+AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_XLIB,
                [test "x$enable_xlib_egl_platform" = "xyes"])
 
 AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],