egl: Clean up header inclusions.
Mainly to remove eglcurrent.h and egldisplay.h from eglglobals.h.
This commit is contained in:
parent
847ac8ec5f
commit
94cb321b5d
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
/**
|
||||
* A generic function ptr type
|
||||
*/
|
||||
typedef void (*_EGLProc)();
|
||||
typedef void (*_EGLProc)(void);
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -4,12 +4,11 @@
|
|||
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
#include "eglconfig.h"
|
||||
#include "egldisplay.h"
|
||||
#include "eglglobals.h"
|
||||
#include "eglcurrent.h"
|
||||
#include "egllog.h"
|
||||
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "eglconfigutil.h"
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include "eglcontext.h"
|
||||
#include "egldisplay.h"
|
||||
#include "egldriver.h"
|
||||
#include "eglglobals.h"
|
||||
#include "eglcurrent.h"
|
||||
#include "eglsurface.h"
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
#ifndef EGLCONTEXT_INCLUDED
|
||||
#define EGLCONTEXT_INCLUDED
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#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() */
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#ifndef EGLCURRENT_INCLUDED
|
||||
#define EGLCURRENT_INCLUDED
|
||||
|
||||
|
||||
#include "egltypedefs.h"
|
||||
|
||||
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
#include "egldisplay.h"
|
||||
#include "egldriver.h"
|
||||
#include "eglglobals.h"
|
||||
#include "eglcurrent.h"
|
||||
#include "eglmutex.h"
|
||||
#include "egllog.h"
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#ifndef EGLDISPLAY_INCLUDED
|
||||
#define EGLDISPLAY_INCLUDED
|
||||
|
||||
|
||||
#include "egltypedefs.h"
|
||||
#include "egldefines.h"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -6,6 +6,9 @@
|
|||
#include "eglapi.h"
|
||||
|
||||
|
||||
typedef _EGLDriver *(*_EGLMain_t)(const char *args);
|
||||
|
||||
|
||||
/**
|
||||
* Base class for device drivers.
|
||||
*/
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
#include "eglglobals.h"
|
||||
#include "egldisplay.h"
|
||||
#include "egldriver.h"
|
||||
#include "eglmutex.h"
|
||||
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
#ifndef EGLGLOBALS_INCLUDED
|
||||
#define EGLGLOBALS_INCLUDED
|
||||
|
||||
|
||||
#include "egltypedefs.h"
|
||||
#include "egldisplay.h"
|
||||
#include "eglcurrent.h"
|
||||
#include "eglmutex.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 */
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
#include "eglglobals.h"
|
||||
#include "eglcurrent.h"
|
||||
#include "eglmisc.h"
|
||||
#include "egldisplay.h"
|
||||
|
||||
|
|
|
@ -29,7 +29,8 @@
|
|||
#ifndef EGLMISC_INCLUDED
|
||||
#define EGLMISC_INCLUDED
|
||||
|
||||
#include "egldriver.h"
|
||||
|
||||
#include "egltypedefs.h"
|
||||
|
||||
|
||||
extern const char *
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
@ -6,7 +5,7 @@
|
|||
#include "egldisplay.h"
|
||||
#include "egldriver.h"
|
||||
#include "eglmode.h"
|
||||
#include "eglglobals.h"
|
||||
#include "eglcurrent.h"
|
||||
#include "eglscreen.h"
|
||||
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
#include "egldisplay.h"
|
||||
#include "eglglobals.h"
|
||||
#include "eglcurrent.h"
|
||||
#include "eglmode.h"
|
||||
#include "eglconfig.h"
|
||||
#include "eglsurface.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
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue