From dd438ae34bdbaa6651cdd226d5fec15a892923bf Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 28 Feb 2015 17:20:01 +0000 Subject: [PATCH] egl/main: no longer export internal function With the split of the gallium egl module we had previously it required access to some of the internal functions. As the only build (automake) that did this no longer builds it we can now appropriately hide those functions. Cc: 10.5 Signed-off-by: Emil Velikov Reviewed-by: Matt Turner Reviewed-by: Brian Paul --- src/egl/main/eglarray.h | 4 ++-- src/egl/main/eglconfig.c | 2 +- src/egl/main/eglconfig.h | 14 +++++++------- src/egl/main/eglcontext.h | 4 ++-- src/egl/main/eglcurrent.c | 2 +- src/egl/main/eglcurrent.h | 8 ++++---- src/egl/main/egldisplay.h | 10 +++++----- src/egl/main/egldriver.h | 6 +++--- src/egl/main/eglimage.h | 4 ++-- src/egl/main/egllog.h | 6 +++--- src/egl/main/eglscreen.h | 4 ++-- src/egl/main/eglsurface.h | 6 +++--- src/egl/main/eglsync.h | 2 +- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/egl/main/eglarray.h b/src/egl/main/eglarray.h index bde5ba50f80..228f6c3d2ca 100644 --- a/src/egl/main/eglarray.h +++ b/src/egl/main/eglarray.h @@ -50,7 +50,7 @@ extern _EGLArray * _eglCreateArray(const char *name, EGLint init_size); -PUBLIC void +extern void _eglDestroyArray(_EGLArray *array, void (*free_cb)(void *)); @@ -66,7 +66,7 @@ void * _eglFindArray(_EGLArray *array, void *elem); -PUBLIC EGLint +extern EGLint _eglFilterArray(_EGLArray *array, void **data, EGLint size, _EGLArrayForEach filter, void *filter_data); diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c index 50fcbb09042..db42e95f88d 100644 --- a/src/egl/main/eglconfig.c +++ b/src/egl/main/eglconfig.c @@ -77,7 +77,7 @@ _eglInitConfig(_EGLConfig *conf, _EGLDisplay *dpy, EGLint id) * * Note that we just save the ptr to the config (we don't copy the config). */ -PUBLIC EGLConfig +EGLConfig _eglLinkConfig(_EGLConfig *conf) { _EGLDisplay *dpy = conf->Display; diff --git a/src/egl/main/eglconfig.h b/src/egl/main/eglconfig.h index 5fa8f330076..dc59ea3f72f 100644 --- a/src/egl/main/eglconfig.h +++ b/src/egl/main/eglconfig.h @@ -164,11 +164,11 @@ _eglGetConfigKey(const _EGLConfig *conf, EGLint key) } -PUBLIC void +extern void _eglInitConfig(_EGLConfig *config, _EGLDisplay *dpy, EGLint id); -PUBLIC EGLConfig +extern EGLConfig _eglLinkConfig(_EGLConfig *conf); @@ -186,25 +186,25 @@ _eglGetConfigHandle(_EGLConfig *conf) } -PUBLIC EGLBoolean +extern EGLBoolean _eglValidateConfig(const _EGLConfig *conf, EGLBoolean for_matching); -PUBLIC EGLBoolean +extern EGLBoolean _eglMatchConfig(const _EGLConfig *conf, const _EGLConfig *criteria); -PUBLIC EGLBoolean +extern EGLBoolean _eglParseConfigAttribList(_EGLConfig *conf, _EGLDisplay *dpy, const EGLint *attrib_list); -PUBLIC EGLint +extern EGLint _eglCompareConfigs(const _EGLConfig *conf1, const _EGLConfig *conf2, const _EGLConfig *criteria, EGLBoolean compare_id); -PUBLIC EGLBoolean +extern EGLBoolean _eglFilterConfigArray(_EGLArray *array, EGLConfig *configs, EGLint config_size, EGLint *num_configs, EGLBoolean (*match)(const _EGLConfig *, void *), diff --git a/src/egl/main/eglcontext.h b/src/egl/main/eglcontext.h index 5b574b5548f..241917f3bea 100644 --- a/src/egl/main/eglcontext.h +++ b/src/egl/main/eglcontext.h @@ -64,7 +64,7 @@ struct _egl_context }; -PUBLIC EGLBoolean +extern EGLBoolean _eglInitContext(_EGLContext *ctx, _EGLDisplay *dpy, _EGLConfig *config, const EGLint *attrib_list); @@ -73,7 +73,7 @@ extern EGLBoolean _eglQueryContext(_EGLDriver *drv, _EGLDisplay *dpy, _EGLContext *ctx, EGLint attribute, EGLint *value); -PUBLIC EGLBoolean +extern EGLBoolean _eglBindContext(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read, _EGLContext **old_ctx, _EGLSurface **old_draw, _EGLSurface **old_read); diff --git a/src/egl/main/eglcurrent.c b/src/egl/main/eglcurrent.c index d358feaad5e..3d496411cbb 100644 --- a/src/egl/main/eglcurrent.c +++ b/src/egl/main/eglcurrent.c @@ -244,7 +244,7 @@ _eglIsCurrentThreadDummy(void) /** * Return the currently bound context of the given API, or NULL. */ -PUBLIC _EGLContext * +_EGLContext * _eglGetAPIContext(EGLenum api) { _EGLThreadInfo *t = _eglGetCurrentThread(); diff --git a/src/egl/main/eglcurrent.h b/src/egl/main/eglcurrent.h index a2856d25956..3343755c985 100644 --- a/src/egl/main/eglcurrent.h +++ b/src/egl/main/eglcurrent.h @@ -91,7 +91,7 @@ _eglConvertApiFromIndex(EGLint idx) } -PUBLIC _EGLThreadInfo * +extern _EGLThreadInfo * _eglGetCurrentThread(void); @@ -103,15 +103,15 @@ extern EGLBoolean _eglIsCurrentThreadDummy(void); -PUBLIC _EGLContext * +extern _EGLContext * _eglGetAPIContext(EGLenum api); -PUBLIC _EGLContext * +extern _EGLContext * _eglGetCurrentContext(void); -PUBLIC EGLBoolean +extern EGLBoolean _eglError(EGLint errCode, const char *msg); diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index 213b96a680d..9c3c8c7cf16 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -178,11 +178,11 @@ extern _EGLDisplay * _eglFindDisplay(_EGLPlatformType plat, void *plat_dpy); -PUBLIC void +extern void _eglReleaseDisplayResources(_EGLDriver *drv, _EGLDisplay *dpy); -PUBLIC void +extern void _eglCleanupDisplay(_EGLDisplay *disp); @@ -190,7 +190,7 @@ extern EGLBoolean _eglCheckDisplayHandle(EGLDisplay dpy); -PUBLIC EGLBoolean +extern EGLBoolean _eglCheckResource(void *res, _EGLResourceType type, _EGLDisplay *dpy); @@ -222,11 +222,11 @@ extern void _eglInitResource(_EGLResource *res, EGLint size, _EGLDisplay *dpy); -PUBLIC void +extern void _eglGetResource(_EGLResource *res); -PUBLIC EGLBoolean +extern EGLBoolean _eglPutResource(_EGLResource *res); diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index ccb70ace4f9..11300ce1ee2 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -98,7 +98,7 @@ extern _EGLDriver * _eglBuiltInDriverGLX(const char *args); -PUBLIC _EGLDriver * +extern _EGLDriver * _eglMain(const char *args); @@ -115,11 +115,11 @@ _eglUnloadDrivers(void); /* defined in eglfallbacks.c */ -PUBLIC void +extern void _eglInitDriverFallbacks(_EGLDriver *drv); -PUBLIC void +extern void _eglSearchPathForEach(EGLBoolean (*callback)(const char *, size_t, void *), void *callback_data); diff --git a/src/egl/main/eglimage.h b/src/egl/main/eglimage.h index 71c52cadb97..50a87a18890 100644 --- a/src/egl/main/eglimage.h +++ b/src/egl/main/eglimage.h @@ -81,12 +81,12 @@ struct _egl_image }; -PUBLIC EGLint +extern EGLint _eglParseImageAttribList(_EGLImageAttribs *attrs, _EGLDisplay *dpy, const EGLint *attrib_list); -PUBLIC EGLBoolean +extern EGLBoolean _eglInitImage(_EGLImage *img, _EGLDisplay *dpy); diff --git a/src/egl/main/egllog.h b/src/egl/main/egllog.h index bac57208b85..12a477ee054 100644 --- a/src/egl/main/egllog.h +++ b/src/egl/main/egllog.h @@ -43,15 +43,15 @@ typedef void (*_EGLLogProc)(EGLint level, const char *msg); -PUBLIC void +extern void _eglSetLogProc(_EGLLogProc logger); -PUBLIC void +extern void _eglSetLogLevel(EGLint level); -PUBLIC void +extern void _eglLog(EGLint level, const char *fmtStr, ...); diff --git a/src/egl/main/eglscreen.h b/src/egl/main/eglscreen.h index 542f2de886f..c554e1d5812 100644 --- a/src/egl/main/eglscreen.h +++ b/src/egl/main/eglscreen.h @@ -68,11 +68,11 @@ struct _egl_screen }; -PUBLIC void +extern void _eglInitScreen(_EGLScreen *screen, _EGLDisplay *dpy, EGLint num_modes); -PUBLIC EGLScreenMESA +extern EGLScreenMESA _eglLinkScreen(_EGLScreen *screen); diff --git a/src/egl/main/eglsurface.h b/src/egl/main/eglsurface.h index 898f3a4f929..438e27cebc8 100644 --- a/src/egl/main/eglsurface.h +++ b/src/egl/main/eglsurface.h @@ -79,7 +79,7 @@ struct _egl_surface }; -PUBLIC EGLBoolean +extern EGLBoolean _eglInitSurface(_EGLSurface *surf, _EGLDisplay *dpy, EGLint type, _EGLConfig *config, const EGLint *attrib_list); @@ -92,10 +92,10 @@ extern EGLBoolean _eglSurfaceAttrib(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf, EGLint attribute, EGLint value); -PUBLIC extern EGLBoolean +extern EGLBoolean _eglBindTexImage(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf, EGLint buffer); -PUBLIC extern EGLBoolean +extern EGLBoolean _eglReleaseTexImage(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint buffer); diff --git a/src/egl/main/eglsync.h b/src/egl/main/eglsync.h index cd2d78326f9..c6cf8c6479e 100644 --- a/src/egl/main/eglsync.h +++ b/src/egl/main/eglsync.h @@ -50,7 +50,7 @@ struct _egl_sync }; -PUBLIC EGLBoolean +extern EGLBoolean _eglInitSync(_EGLSync *sync, _EGLDisplay *dpy, EGLenum type, const EGLint *attrib_list); -- 2.30.2