diff options
| author | Emil Velikov <[email protected]> | 2015-07-14 01:57:23 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-07-22 16:35:26 +0100 |
| commit | c17e01748e9efc2d638b7b5bc9d4344521334f48 (patch) | |
| tree | f0ec138a78de8588297e28272127587889f2761c | |
| parent | 3593f37fd7b599e217bd1f894ac671a14a058b8d (diff) | |
egl: remove final Windows specific workaround
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
| -rw-r--r-- | src/egl/main/Android.mk | 3 | ||||
| -rw-r--r-- | src/egl/main/Makefile.am | 3 | ||||
| -rw-r--r-- | src/egl/main/SConscript | 1 | ||||
| -rw-r--r-- | src/egl/main/egldriver.c | 5 |
4 files changed, 2 insertions, 10 deletions
diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk index 0ba72953960..4856528ed54 100644 --- a/src/egl/main/Android.mk +++ b/src/egl/main/Android.mk @@ -40,8 +40,7 @@ LOCAL_SRC_FILES := $(SOURCES) LOCAL_CFLAGS := \ -D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_ANDROID \ - -D_EGL_DRIVER_SEARCH_DIR=\"/system/lib/egl\" \ - -D_EGL_OS_UNIX=1 + -D_EGL_DRIVER_SEARCH_DIR=\"/system/lib/egl\" LOCAL_SHARED_LIBRARIES := \ libdl \ diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am index ec0f88e0424..77f8b34acee 100644 --- a/src/egl/main/Makefile.am +++ b/src/egl/main/Makefile.am @@ -28,8 +28,7 @@ AM_CFLAGS = \ $(VISIBILITY_CFLAGS) \ $(EGL_CFLAGS) \ -D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM) \ - -D_EGL_DRIVER_SEARCH_DIR=\"$(libdir)/egl\" \ - -D_EGL_OS_UNIX=1 + -D_EGL_DRIVER_SEARCH_DIR=\"$(libdir)/egl\" lib_LTLIBRARIES = libEGL.la diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript index 6fc13416a5d..b77ae783941 100644 --- a/src/egl/main/SConscript +++ b/src/egl/main/SConscript @@ -12,7 +12,6 @@ env.Append(CPPDEFINES = [ env.Append(CPPDEFINES = [ '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_HAIKU', - '_EGL_OS_UNIX', '_EGL_BUILT_IN_DRIVER_HAIKU', ]) env.Prepend(LIBS = [ diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c index 05ccd0e3796..b9b21dec5ea 100644 --- a/src/egl/main/egldriver.c +++ b/src/egl/main/egldriver.c @@ -96,15 +96,10 @@ _eglLoadModule(_EGLModule *mod) static void _eglUnloadModule(_EGLModule *mod) { -#if defined(_EGL_OS_UNIX) /* destroy the driver */ if (mod->Driver && mod->Driver->Unload) mod->Driver->Unload(mod->Driver); -#elif defined(_EGL_OS_WINDOWS) - /* XXX Windows unloads DLLs before atexit */ -#endif - mod->Driver = NULL; } |