diff options
| author | Eric Anholt <[email protected]> | 2012-02-05 07:01:17 +0100 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-02-29 11:52:40 -0800 |
| commit | 9f0f00c319a18ec2e9f022482fa11990e682c1d7 (patch) | |
| tree | f039c16fb0f218ee0f2e39db3066ce4579a2298a | |
| parent | 8ffb098234fbc3d2e3c8b3db6912dec9ea7a65eb (diff) | |
egl: Drop _EGL_MAIN entrypoint obfuscation.
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/egl/drivers/dri2/Android.mk | 1 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/Makefile | 1 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/egl_dri2.c | 2 | ||||
| -rw-r--r-- | src/egl/drivers/glx/Makefile | 1 | ||||
| -rw-r--r-- | src/egl/drivers/glx/egl_glx.c | 2 |
5 files changed, 2 insertions, 5 deletions
diff --git a/src/egl/drivers/dri2/Android.mk b/src/egl/drivers/dri2/Android.mk index 5c506f83ab2..090a0e157c1 100644 --- a/src/egl/drivers/dri2/Android.mk +++ b/src/egl/drivers/dri2/Android.mk @@ -32,7 +32,6 @@ LOCAL_SRC_FILES := \ platform_android.c LOCAL_CFLAGS := \ - -D_EGL_MAIN=_eglBuiltInDriverDRI2 \ -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\" \ -DHAVE_SHARED_GLAPI \ -DHAVE_ANDROID_PLATFORM diff --git a/src/egl/drivers/dri2/Makefile b/src/egl/drivers/dri2/Makefile index 8ea30967fb5..305a739d11a 100644 --- a/src/egl/drivers/dri2/Makefile +++ b/src/egl/drivers/dri2/Makefile @@ -18,7 +18,6 @@ EGL_INCLUDES = \ EGL_LIBS = $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIB) -EGL_CFLAGS = -D_EGL_MAIN=_eglBuiltInDriverDRI2 EGL_BUILTIN = true ifeq ($(SHARED_GLAPI),1) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 80b2e38d9d3..4a028383832 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1408,7 +1408,7 @@ dri2_load(_EGLDriver *drv) * Create a new _EGLDriver object and init its dispatch table. */ _EGLDriver * -_EGL_MAIN(const char *args) +_eglBuiltInDriverDRI2(const char *args) { struct dri2_egl_driver *dri2_drv; diff --git a/src/egl/drivers/glx/Makefile b/src/egl/drivers/glx/Makefile index a1e6b731fe9..1625e031bd9 100644 --- a/src/egl/drivers/glx/Makefile +++ b/src/egl/drivers/glx/Makefile @@ -13,7 +13,6 @@ EGL_INCLUDES = \ EGL_CFLAGS = $(X11_CFLAGS) EGL_LIBS = $(X11_LIBS) $(DLOPEN_LIBS) -EGL_CFLAGS += -D_EGL_MAIN=_eglBuiltInDriverGLX EGL_BUILTIN = true include ../Makefile.template diff --git a/src/egl/drivers/glx/egl_glx.c b/src/egl/drivers/glx/egl_glx.c index e07ce90a9a8..607185354f2 100644 --- a/src/egl/drivers/glx/egl_glx.c +++ b/src/egl/drivers/glx/egl_glx.c @@ -1147,7 +1147,7 @@ fail: * Create a new _EGLDriver object and init its dispatch table. */ _EGLDriver * -_EGL_MAIN(const char *args) +_eglBuiltInDriverGLX(const char *args) { struct GLX_egl_driver *GLX_drv = CALLOC_STRUCT(GLX_egl_driver); |