From 00a5523667f91f15ca61d67fc0451b7b5badd83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 3 May 2018 21:03:37 +0200 Subject: [PATCH] cogl: Remove some left over KMS backend stuff --- clutter/clutter/egl/clutter-egl.h | 5 ----- cogl/cogl/cogl.symbols | 6 ------ cogl/configure.ac | 33 ------------------------------- 3 files changed, 44 deletions(-) diff --git a/clutter/clutter/egl/clutter-egl.h b/clutter/clutter/egl/clutter-egl.h index 83b021343..0a4ab05d9 100644 --- a/clutter/clutter/egl/clutter-egl.h +++ b/clutter/clutter/egl/clutter-egl.h @@ -87,11 +87,6 @@ EGLDisplay clutter_egl_display (void); CLUTTER_AVAILABLE_IN_1_6 EGLDisplay clutter_egl_get_egl_display (void); -#ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT -CLUTTER_AVAILABLE_IN_1_18 -void clutter_egl_set_kms_fd (int fd); -#endif - CLUTTER_AVAILABLE_IN_1_20 void clutter_egl_freeze_master_clock (void); CLUTTER_AVAILABLE_IN_1_20 diff --git a/cogl/cogl/cogl.symbols b/cogl/cogl/cogl.symbols index c1cd50e07..d7f700012 100644 --- a/cogl/cogl/cogl.symbols +++ b/cogl/cogl/cogl.symbols @@ -415,12 +415,6 @@ cogl_is_texture_rectangle cogl_is_texture_2d cogl_is_texture_3d -#ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT -cogl_kms_display_queue_modes_reset -cogl_kms_display_set_layout -cogl_kms_renderer_get_kms_fd -#endif - cogl_material_alpha_func_get_type cogl_material_copy cogl_material_filter_get_type diff --git a/cogl/configure.ac b/cogl/configure.ac index 62f77555c..3a935b040 100644 --- a/cogl/configure.ac +++ b/cogl/configure.ac @@ -632,39 +632,6 @@ AM_CONDITIONAL(SUPPORT_GLX, [test "x$SUPPORT_GLX" = "xyes"]) EGL_PLATFORM_COUNT=0 -AC_ARG_ENABLE( - [kms-egl-platform], - [AC_HELP_STRING([--enable-kms-egl-platform=@<:@no/yes@:>@], [Enable support for the KMS egl platform @<:@default=no@:>@])], - [], - enable_kms_egl_platform=yes -) -AS_IF([test "x$enable_kms_egl_platform" = "xyes"], - [ - EGL_PLATFORM_COUNT=$((EGL_PLATFORM_COUNT+1)) - NEED_EGL=yes - EGL_PLATFORMS="$EGL_PLATFORMS kms" - - PKG_CHECK_EXISTS([gbm], - [ - COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES gbm" - COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES libdrm" - ], - [AC_MSG_ERROR([Unable to locate required libgbm library for the KMS egl platform])]) - - GBM_VERSION=`$PKG_CONFIG --modversion gbm` - GBM_MAJOR=`echo $GBM_VERSION | cut -d'.' -f1` - GBM_MINOR=`echo $GBM_VERSION | cut -d'.' -f2` - GBM_MICRO=`echo $GBM_VERSION | cut -d'.' -f3 | sed 's/-.*//'` - - AC_DEFINE_UNQUOTED([COGL_GBM_MAJOR], [$GBM_MAJOR], [The major version for libgbm]) - AC_DEFINE_UNQUOTED([COGL_GBM_MINOR], [$GBM_MINOR], [The minor version for libgbm]) - AC_DEFINE_UNQUOTED([COGL_GBM_MICRO], [$GBM_MICRO], [The micro version for libgbm]) - - COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_KMS_SUPPORT" - ]) -AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_KMS, - [test "x$enable_kms_egl_platform" = "xyes"]) - AC_ARG_ENABLE( [wayland-egl-server], [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],