From ce0dc2160cc491c60a2849539ba8abc9e5d1d0ad Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Fri, 25 Feb 2011 00:49:07 +0000 Subject: [PATCH] remove references to unused DRM_SURFACELESS EGL platform The "DRM_SURFACELESS" EGL platform was invented when we were adding the wayland backend to Clutter but in the end we added a dedicated backend instead of extending the EGL backend so actually the platform name isn't used. --- clutter/cogl/cogl/Makefile.am | 5 ----- clutter/cogl/configure.ac | 1 - configure.ac | 8 -------- 3 files changed, 14 deletions(-) diff --git a/clutter/cogl/cogl/Makefile.am b/clutter/cogl/cogl/Makefile.am index a9d1d0783..426b59ae0 100644 --- a/clutter/cogl/cogl/Makefile.am +++ b/clutter/cogl/cogl/Makefile.am @@ -345,11 +345,6 @@ cogl_sources_c += \ $(srcdir)/winsys/cogl-winsys-egl.c \ $(srcdir)/winsys/cogl-winsys-stub.c endif -if SUPPORT_EGL_PLATFORM_DRM_SURFACELESS -cogl_sources_c += \ - $(srcdir)/winsys/cogl-winsys-egl.c \ - $(srcdir)/winsys/cogl-winsys-stub.c -endif if SUPPORT_WIN32 cogl_sources_c += \ $(srcdir)/winsys/cogl-winsys-win32.c \ diff --git a/clutter/cogl/configure.ac b/clutter/cogl/configure.ac index 45bfe8c72..89c43da56 100644 --- a/clutter/cogl/configure.ac +++ b/clutter/cogl/configure.ac @@ -272,7 +272,6 @@ AM_CONDITIONAL(SUPPORT_EGL, [false]) AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_X11, [false]) AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_NULL, [false]) AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_GDL, [false]) -AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_DRM_SURFACELESS, [false]) AM_CONDITIONAL(SUPPORT_OSX, [false]) AM_CONDITIONAL(SUPPORT_WIN32, [false]) AM_CONDITIONAL(SUPPORT_CEX100, [false]) diff --git a/configure.ac b/configure.ac index 818469691..65d044f99 100644 --- a/configure.ac +++ b/configure.ac @@ -294,7 +294,6 @@ AS_CASE([$CLUTTER_FLAVOUR], CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_WAYLAND" SUPPORT_WAYLAND=1 - SUPPORT_EGL_PLATFORM_DRM_SURFACELESS=1 COGL_DRIVER="gl" @@ -504,12 +503,6 @@ AS_IF([test "x$SUPPORT_EGL_PLATFORM_POWERVR_GDL" = "x1"], [Cogl supports OpenGL[ES] using the EGL API with the GDL API]) ]) -AS_IF([test "x$SUPPORT_EGL_PLATFORM_DRM_SURFACELESS" = "x1"], - [ - AC_DEFINE([COGL_HAS_EGL_PLATFORM_DRM_SURFACELESS_SUPPORT], [1], - [Cogl supports OpenGL[ES] using the EGL API with EGL_MESA_drm_display]) - ]) - # winsys conditionals for use in automake files... AM_CONDITIONAL(SUPPORT_GLX, [test "x$SUPPORT_GLX" = "x1"]) AM_CONDITIONAL(SUPPORT_X11, [test "x$SUPPORT_X11" = "x1"]) @@ -518,7 +511,6 @@ AM_CONDITIONAL(SUPPORT_EGL, [test "x$SUPPORT_EGL" = "x1"]) AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_X11, [test "x$SUPPORT_EGL_PLATFORM_POWERVR_X11" = "x1"]) AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_NULL, [test "x$SUPPORT_EGL_PLATFORM_POWERVR_NULL" = "x1"]) AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_GDL, [test "x$SUPPORT_EGL_PLATFORM_POWERVR_GDL" = "x1"]) -AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_DRM_SURFACELESS, [test "x$SUPPORT_EGL_PLATFORM_DRM_SURFACELESS" = "x1"]) AM_CONDITIONAL(SUPPORT_OSX, [test "x$CLUTTER_WINSYS" = "xosx"]) AM_CONDITIONAL(SUPPORT_WIN32, [test "x$CLUTTER_WINSYS" = "xwin32"]) AM_CONDITIONAL(SUPPORT_CEX100, [test "x$SUPPORT_EGL_PLATFORM_POWERVR_GDL" = "x1"])