From c8aae9a663f46e572da5f124f56c291f1db26353 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Fri, 18 Jun 2010 04:38:43 +0100
Subject: [PATCH] egl: Consolidates eglx and eglnative into one "egl" winsys

This remove quite a lot of redundant code by consolidating the eglx and
eglnative window system backends.
---
 cogl/Makefile.am                        |  4 +--
 cogl/winsys/{cogl-eglx.c => cogl-egl.c} |  0
 cogl/winsys/cogl-eglnative.c            | 35 -------------------------
 3 files changed, 2 insertions(+), 37 deletions(-)
 rename cogl/winsys/{cogl-eglx.c => cogl-egl.c} (100%)
 delete mode 100644 cogl/winsys/cogl-eglnative.c

diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 0540166ee..81253f50e 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -165,12 +165,12 @@ libclutter_cogl_la_SOURCES += \
 endif
 if SUPPORT_EGL_PLATFORM_POWERVR_X11
 libclutter_cogl_la_SOURCES += \
-       $(srcdir)/winsys/cogl-eglx.c \
+       $(srcdir)/winsys/cogl-egl.c \
        $(srcdir)/winsys/cogl-xlib.c
 endif
 if SUPPORT_EGL_PLATFORM_POWERVR_NULL
 libclutter_cogl_la_SOURCES += \
-       $(srcdir)/winsys/cogl-eglnative.c
+       $(srcdir)/winsys/cogl-egl.c
 endif
 if SUPPORT_EGL_PLATFORM_FRUITY
 libclutter_cogl_la_SOURCES += \
diff --git a/cogl/winsys/cogl-eglx.c b/cogl/winsys/cogl-egl.c
similarity index 100%
rename from cogl/winsys/cogl-eglx.c
rename to cogl/winsys/cogl-egl.c
diff --git a/cogl/winsys/cogl-eglnative.c b/cogl/winsys/cogl-eglnative.c
deleted file mode 100644
index 9c937e4bc..000000000
--- a/cogl/winsys/cogl-eglnative.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Cogl
- *
- * An object oriented GL/GLES Abstraction/Utility Layer
- *
- * Copyright (C) 2007,2008,2009 Intel Corporation.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "cogl.h"
-
-CoglFuncPtr
-_cogl_winsys_get_proc_address (const char *name)
-{
-  return NULL;
-}
-