diff options
| author | Jose Fonseca <[email protected]> | 2015-03-03 16:01:22 +0000 |
|---|---|---|
| committer | Jose Fonseca <[email protected]> | 2015-03-04 11:01:42 +0000 |
| commit | 5564c361b5cc1f5ec4be3622d7f9be601e3c268a (patch) | |
| tree | edd2e212e86ad94257f5b4bf80659e4affee82a0 /src/egl/main | |
| parent | 17b2825d760fb6a7b643e5f9c067d249a582cfdb (diff) | |
st/egl: Remove.
Largely superseeded by src/egl, and
WGL/GLX_EXT_create_context_es_profile extensions.
Note this will break Android.mk with gallium drivers -- somebody
familiar with that build infrastructure will need to update it to use
gallium drivers through egl_dri2.
v2: Remove the _EGL_BUILT_IN_DRIVER_GALLIUM define from
src/egl/main/Android.mk; and update the src/egl/main/Sconscript to
create a SharedLibrary, add versioning, create symlink - copy the bits
from egl-static, per Emil Velikov.
Reviewed-by: Emil Velikov <[email protected]>
v3: Disallow undefined symbols in libEGL.so. Update release notes
Diffstat (limited to 'src/egl/main')
| -rw-r--r-- | src/egl/main/Android.mk | 2 | ||||
| -rw-r--r-- | src/egl/main/SConscript | 12 | ||||
| -rw-r--r-- | src/egl/main/egldriver.c | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk index 8537381ce16..4d0cc575f02 100644 --- a/src/egl/main/Android.mk +++ b/src/egl/main/Android.mk @@ -73,8 +73,6 @@ endif # MESA_BUILD_CLASSIC ifeq ($(strip $(MESA_BUILD_GALLIUM)),true) -LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GALLIUM - gallium_DRIVERS := # swrast diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript index 5d0073e14e0..399c020c2d0 100644 --- a/src/egl/main/SConscript +++ b/src/egl/main/SConscript @@ -7,7 +7,6 @@ Import('*') env = env.Clone() env.Append(CPPDEFINES = [ - '_EGL_BUILT_IN_DRIVER_GALLIUM', '_EGL_DRIVER_SEARCH_DIR=\\"\\"', ]) @@ -38,6 +37,9 @@ else: egl_dri2, libloader, ]) + # Disallow undefined symbols + if env['platform'] != 'darwin': + env.Append(SHLINKFLAGS = ['-Wl,-z,defs']) env.Append(CPPPATH = [ '#/include', @@ -47,9 +49,11 @@ env.Append(CPPPATH = [ # parse Makefile.sources egl_sources = env.ParseSourceList('Makefile.sources', 'LIBEGL_C_FILES') -egl = env.ConvenienceLibrary( - target = 'egl', +egl = env.SharedLibrary( + target = 'EGL', source = egl_sources, ) -Export('egl') +egl = env.InstallSharedLibrary(egl, version=(1, 0, 0)) + +env.Alias('egl', egl) diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c index 7ad14d32a7e..e6a61f3108b 100644 --- a/src/egl/main/egldriver.c +++ b/src/egl/main/egldriver.c @@ -70,9 +70,6 @@ const struct { const char *name; _EGLMain_t main; } _eglBuiltInDrivers[] = { -#ifdef _EGL_BUILT_IN_DRIVER_GALLIUM - { "egl_gallium", _eglBuiltInDriverGALLIUM }, -#endif #ifdef _EGL_BUILT_IN_DRIVER_DRI2 { "egl_dri2", _eglBuiltInDriverDRI2 }, #endif |