From 94cb321b5d246185abf71d89968d472a626f1a23 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Fri, 29 Jan 2010 09:00:30 +0800 Subject: egl: Clean up header inclusions. Mainly to remove eglcurrent.h and egldisplay.h from eglglobals.h. --- src/egl/drivers/glx/egl_glx.c | 2 +- src/egl/drivers/xdri/egl_xdri.c | 2 +- src/egl/main/eglapi.c | 1 + src/egl/main/eglapi.h | 2 +- src/egl/main/eglconfig.c | 3 +-- src/egl/main/eglconfigutil.c | 1 - src/egl/main/eglcontext.c | 2 +- src/egl/main/eglcontext.h | 1 - src/egl/main/eglcurrent.c | 4 ++-- src/egl/main/eglcurrent.h | 1 + src/egl/main/egldisplay.c | 1 + src/egl/main/egldisplay.h | 1 + src/egl/main/egldriver.c | 1 + src/egl/main/egldriver.h | 3 +++ src/egl/main/eglglobals.c | 1 + src/egl/main/eglglobals.h | 3 +-- src/egl/main/egllog.h | 2 ++ src/egl/main/eglmisc.c | 2 +- src/egl/main/eglmisc.h | 3 ++- src/egl/main/eglmode.c | 3 +-- src/egl/main/eglscreen.c | 1 + src/egl/main/eglscreen.h | 3 +++ src/egl/main/eglsurface.c | 2 +- src/egl/main/egltypedefs.h | 4 ---- 24 files changed, 28 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/egl/drivers/glx/egl_glx.c b/src/egl/drivers/glx/egl_glx.c index 1c38db64915..af653b86eee 100644 --- a/src/egl/drivers/glx/egl_glx.c +++ b/src/egl/drivers/glx/egl_glx.c @@ -43,7 +43,7 @@ #include "eglcontext.h" #include "egldisplay.h" #include "egldriver.h" -#include "eglglobals.h" +#include "eglcurrent.h" #include "egllog.h" #include "eglsurface.h" diff --git a/src/egl/drivers/xdri/egl_xdri.c b/src/egl/drivers/xdri/egl_xdri.c index 2ca9ea8a5b0..10f7a31f5b9 100644 --- a/src/egl/drivers/xdri/egl_xdri.c +++ b/src/egl/drivers/xdri/egl_xdri.c @@ -52,7 +52,7 @@ #include "eglcontext.h" #include "egldisplay.h" #include "egldriver.h" -#include "eglglobals.h" +#include "eglcurrent.h" #include "egllog.h" #include "eglsurface.h" diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 7e77ef1f038..364ad9c4585 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -60,6 +60,7 @@ #include "egldisplay.h" #include "egltypedefs.h" #include "eglglobals.h" +#include "eglcurrent.h" #include "egldriver.h" #include "eglsurface.h" #include "eglconfig.h" diff --git a/src/egl/main/eglapi.h b/src/egl/main/eglapi.h index a7600820f3f..c3676ec56a1 100644 --- a/src/egl/main/eglapi.h +++ b/src/egl/main/eglapi.h @@ -4,7 +4,7 @@ /** * A generic function ptr type */ -typedef void (*_EGLProc)(); +typedef void (*_EGLProc)(void); /** diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c index 2db9b9401a0..b974e40cce6 100644 --- a/src/egl/main/eglconfig.c +++ b/src/egl/main/eglconfig.c @@ -4,12 +4,11 @@ #include -#include #include #include #include "eglconfig.h" #include "egldisplay.h" -#include "eglglobals.h" +#include "eglcurrent.h" #include "egllog.h" diff --git a/src/egl/main/eglconfigutil.c b/src/egl/main/eglconfigutil.c index ddb886c54de..e416b190f0a 100644 --- a/src/egl/main/eglconfigutil.c +++ b/src/egl/main/eglconfigutil.c @@ -4,7 +4,6 @@ #include -#include #include #include "eglconfigutil.h" diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c index 4496f76eceb..ee9d60e17a6 100644 --- a/src/egl/main/eglcontext.c +++ b/src/egl/main/eglcontext.c @@ -5,7 +5,7 @@ #include "eglcontext.h" #include "egldisplay.h" #include "egldriver.h" -#include "eglglobals.h" +#include "eglcurrent.h" #include "eglsurface.h" diff --git a/src/egl/main/eglcontext.h b/src/egl/main/eglcontext.h index 4811e3bb7ad..ebb50aa60e6 100644 --- a/src/egl/main/eglcontext.h +++ b/src/egl/main/eglcontext.h @@ -1,4 +1,3 @@ - #ifndef EGLCONTEXT_INCLUDED #define EGLCONTEXT_INCLUDED diff --git a/src/egl/main/eglcurrent.c b/src/egl/main/eglcurrent.c index 696d04e8ba9..a19dcf4096c 100644 --- a/src/egl/main/eglcurrent.c +++ b/src/egl/main/eglcurrent.c @@ -1,10 +1,10 @@ #include #include -#include "eglcurrent.h" +#include "eglglobals.h" #include "eglcontext.h" #include "egllog.h" #include "eglmutex.h" -#include "eglglobals.h" +#include "eglcurrent.h" /* This should be kept in sync with _eglInitThreadInfo() */ diff --git a/src/egl/main/eglcurrent.h b/src/egl/main/eglcurrent.h index c169c93e945..e5c94ce60ab 100644 --- a/src/egl/main/eglcurrent.h +++ b/src/egl/main/eglcurrent.h @@ -1,6 +1,7 @@ #ifndef EGLCURRENT_INCLUDED #define EGLCURRENT_INCLUDED + #include "egltypedefs.h" diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index d7a8d142929..5897372fc53 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -10,6 +10,7 @@ #include "egldisplay.h" #include "egldriver.h" #include "eglglobals.h" +#include "eglcurrent.h" #include "eglmutex.h" #include "egllog.h" diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index 4aea10c3eb3..b04b094d847 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -1,6 +1,7 @@ #ifndef EGLDISPLAY_INCLUDED #define EGLDISPLAY_INCLUDED + #include "egltypedefs.h" #include "egldefines.h" diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c index 1dadbf783b6..df36369ac25 100644 --- a/src/egl/main/egldriver.c +++ b/src/egl/main/egldriver.c @@ -13,6 +13,7 @@ #include "egldisplay.h" #include "egldriver.h" #include "eglglobals.h" +#include "eglcurrent.h" #include "egllog.h" #include "eglmisc.h" #include "eglmode.h" diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index 6ebb60a8f10..5149acd9640 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -6,6 +6,9 @@ #include "eglapi.h" +typedef _EGLDriver *(*_EGLMain_t)(const char *args); + + /** * Base class for device drivers. */ diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c index 9c4902621fc..5182b18e226 100644 --- a/src/egl/main/eglglobals.c +++ b/src/egl/main/eglglobals.c @@ -1,6 +1,7 @@ #include #include #include "eglglobals.h" +#include "egldisplay.h" #include "egldriver.h" #include "eglmutex.h" diff --git a/src/egl/main/eglglobals.h b/src/egl/main/eglglobals.h index 5ebb914ca72..cd1dd5851b9 100644 --- a/src/egl/main/eglglobals.h +++ b/src/egl/main/eglglobals.h @@ -1,9 +1,8 @@ #ifndef EGLGLOBALS_INCLUDED #define EGLGLOBALS_INCLUDED + #include "egltypedefs.h" -#include "egldisplay.h" -#include "eglcurrent.h" #include "eglmutex.h" diff --git a/src/egl/main/egllog.h b/src/egl/main/egllog.h index 3a99bfea4b7..03bef2670f1 100644 --- a/src/egl/main/egllog.h +++ b/src/egl/main/egllog.h @@ -1,8 +1,10 @@ #ifndef EGLLOG_INCLUDED #define EGLLOG_INCLUDED + #include "egltypedefs.h" + #define _EGL_FATAL 0 /* unrecoverable error */ #define _EGL_WARNING 1 /* recoverable error/problem */ #define _EGL_INFO 2 /* just useful info */ diff --git a/src/egl/main/eglmisc.c b/src/egl/main/eglmisc.c index 5726f5bca8e..907a057b442 100644 --- a/src/egl/main/eglmisc.c +++ b/src/egl/main/eglmisc.c @@ -33,7 +33,7 @@ #include #include -#include "eglglobals.h" +#include "eglcurrent.h" #include "eglmisc.h" #include "egldisplay.h" diff --git a/src/egl/main/eglmisc.h b/src/egl/main/eglmisc.h index 829d4cde792..5e6a2d41df6 100644 --- a/src/egl/main/eglmisc.h +++ b/src/egl/main/eglmisc.h @@ -29,7 +29,8 @@ #ifndef EGLMISC_INCLUDED #define EGLMISC_INCLUDED -#include "egldriver.h" + +#include "egltypedefs.h" extern const char * diff --git a/src/egl/main/eglmode.c b/src/egl/main/eglmode.c index 0f3ba6e5c08..503b9e595ed 100644 --- a/src/egl/main/eglmode.c +++ b/src/egl/main/eglmode.c @@ -1,4 +1,3 @@ -#include #include #include #include @@ -6,7 +5,7 @@ #include "egldisplay.h" #include "egldriver.h" #include "eglmode.h" -#include "eglglobals.h" +#include "eglcurrent.h" #include "eglscreen.h" diff --git a/src/egl/main/eglscreen.c b/src/egl/main/eglscreen.c index 14a1e9f8fe3..1079a1cbe61 100644 --- a/src/egl/main/eglscreen.c +++ b/src/egl/main/eglscreen.c @@ -17,6 +17,7 @@ #include "egldisplay.h" #include "eglglobals.h" +#include "eglcurrent.h" #include "eglmode.h" #include "eglconfig.h" #include "eglsurface.h" diff --git a/src/egl/main/eglscreen.h b/src/egl/main/eglscreen.h index d52e5388c34..c400ac3d15e 100644 --- a/src/egl/main/eglscreen.h +++ b/src/egl/main/eglscreen.h @@ -2,6 +2,9 @@ #define EGLSCREEN_INCLUDED +#include "egltypedefs.h" + + /** * Per-screen information. * Note that an EGL screen doesn't have a size. A screen may be set to diff --git a/src/egl/main/eglsurface.c b/src/egl/main/eglsurface.c index 3219231ed29..8f87239fe20 100644 --- a/src/egl/main/eglsurface.c +++ b/src/egl/main/eglsurface.c @@ -9,7 +9,7 @@ #include "egldisplay.h" #include "eglcontext.h" #include "eglconfig.h" -#include "eglglobals.h" +#include "eglcurrent.h" #include "egllog.h" #include "eglsurface.h" diff --git a/src/egl/main/egltypedefs.h b/src/egl/main/egltypedefs.h index e6b19b35d01..e0c95762c67 100644 --- a/src/egl/main/egltypedefs.h +++ b/src/egl/main/egltypedefs.h @@ -34,8 +34,4 @@ typedef struct _egl_surface _EGLSurface; typedef struct _egl_thread_info _EGLThreadInfo; - -typedef _EGLDriver *(*_EGLMain_t)(const char *args); - - #endif /* EGLTYPEDEFS_INCLUDED */ -- cgit v1.2.3