brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drop remaining traces of support for directly linking libGL

Browse Source
This commit is contained in:
Rui Matos 2016-04-10 19:23:50 +02:00
parent 0da00392e6
commit 8366fd5438
3 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl-renderer-private.h
View File

@ -71,9 +71,7 @@ struct _CoglRenderer
CoglDriver driver; CoglDriver driver;
unsigned long private_features unsigned long private_features
[COGL_FLAGS_N_LONGS_FOR_SIZE (COGL_N_PRIVATE_FEATURES)]; [COGL_FLAGS_N_LONGS_FOR_SIZE (COGL_N_PRIVATE_FEATURES)];
#ifndef HAVE_DIRECTLY_LINKED_GL_LIBRARY
GModule *libgl_module; GModule *libgl_module;
#endif
#if defined (COGL_HAS_EGL_PLATFORM_KMS_SUPPORT) #if defined (COGL_HAS_EGL_PLATFORM_KMS_SUPPORT)
int kms_fd; int kms_fd;

6
cogl/cogl-renderer.c
View File

@ -213,10 +213,8 @@ _cogl_renderer_free (CoglRenderer *renderer)
if (winsys) if (winsys)
winsys->renderer_disconnect (renderer); winsys->renderer_disconnect (renderer);
#ifndef HAVE_DIRECTLY_LINKED_GL_LIBRARY
if (renderer->libgl_module) if (renderer->libgl_module)
g_module_close (renderer->libgl_module); g_module_close (renderer->libgl_module);
#endif
g_slist_foreach (renderer->event_filters, g_slist_foreach (renderer->event_filters,
(GFunc) native_filter_closure_free, (GFunc) native_filter_closure_free,
@ -535,8 +533,6 @@ _cogl_renderer_choose_driver (CoglRenderer *renderer,
COGL_FLAGS_SET (renderer->private_features, COGL_FLAGS_SET (renderer->private_features,
desc->private_features[i], TRUE); desc->private_features[i], TRUE);
#ifndef HAVE_DIRECTLY_LINKED_GL_LIBRARY
if (COGL_FLAGS_GET (renderer->private_features, if (COGL_FLAGS_GET (renderer->private_features,
COGL_PRIVATE_FEATURE_ANY_GL)) COGL_PRIVATE_FEATURE_ANY_GL))
{ {
@ -553,8 +549,6 @@ _cogl_renderer_choose_driver (CoglRenderer *renderer,
} }
} }
#endif /* HAVE_DIRECTLY_LINKED_GL_LIBRARY */
return TRUE; return TRUE;
} }

16
configure.ac
View File

@ -522,12 +522,6 @@ dnl Drivers first...
dnl ======================================================== dnl ========================================================
EGL_CHECKED=no EGL_CHECKED=no
dnl This gets set to yes if Cogl directly links to the GL library API
dnl so it doesn't need to be dlopened. This currently happens on OSX
dnl where it's not clear if window system API can be separated
dnl from the GL API.
GL_LIBRARY_DIRECTLY_LINKED=no
enabled_drivers="" enabled_drivers=""
HAVE_GLES1=0 HAVE_GLES1=0
@ -711,11 +705,6 @@ AC_SUBST([COGL_GLES2_LIBNAME])
AC_SUBST([HAVE_GLES2]) AC_SUBST([HAVE_GLES2])
AC_SUBST([COGL_DEFAULT_DRIVER]) AC_SUBST([COGL_DEFAULT_DRIVER])
if test "x$GL_LIBRARY_DIRECTLY_LINKED" = "xyes"; then
AC_DEFINE([HAVE_DIRECTLY_LINKED_GL_LIBRARY], [1],
[Defined if the GL library should not be dlopened])
fi
AC_ARG_ENABLE( AC_ARG_ENABLE(
[cogl-gles2], [cogl-gles2],
[AC_HELP_STRING([--enable-cogl-gles2=@<:@no/yes@:>@], [AC_HELP_STRING([--enable-cogl-gles2=@<:@no/yes@:>@],
@ -1130,12 +1119,11 @@ echo ""
# Features # Features
echo " • Features:" echo " • Features:"
echo " Drivers: ${enabled_drivers}" echo " Drivers: ${enabled_drivers}"
AS_IF([test "x$GL_LIBRARY_DIRECTLY_LINKED" != xyes], for driver in $enabled_drivers; do
[for driver in $enabled_drivers; do
driver=`echo $driver | tr "[gles]" "[GLES]"` driver=`echo $driver | tr "[gles]" "[GLES]"`
libname=`eval echo \\$COGL_${driver}_LIBNAME` libname=`eval echo \\$COGL_${driver}_LIBNAME`
echo " Library name for $driver: $libname" echo " Library name for $driver: $libname"
done]) done
echo " GL Window System APIs:${GL_WINSYS_APIS}" echo " GL Window System APIs:${GL_WINSYS_APIS}"
if test "x$SUPPORT_EGL" = "xyes"; then if test "x$SUPPORT_EGL" = "xyes"; then
echo " EGL Platforms:${EGL_PLATFORMS}" echo " EGL Platforms:${EGL_PLATFORMS}"