summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/egl/drivers/glx/egl_glx.c2
-rw-r--r--src/egl/drivers/xdri/egl_xdri.c2
-rw-r--r--src/egl/main/eglapi.c1
-rw-r--r--src/egl/main/eglapi.h2
-rw-r--r--src/egl/main/eglconfig.c3
-rw-r--r--src/egl/main/eglconfigutil.c1
-rw-r--r--src/egl/main/eglcontext.c2
-rw-r--r--src/egl/main/eglcontext.h1
-rw-r--r--src/egl/main/eglcurrent.c4
-rw-r--r--src/egl/main/eglcurrent.h1
-rw-r--r--src/egl/main/egldisplay.c1
-rw-r--r--src/egl/main/egldisplay.h1
-rw-r--r--src/egl/main/egldriver.c1
-rw-r--r--src/egl/main/egldriver.h3
-rw-r--r--src/egl/main/eglglobals.c1
-rw-r--r--src/egl/main/eglglobals.h3
-rw-r--r--src/egl/main/egllog.h2
-rw-r--r--src/egl/main/eglmisc.c2
-rw-r--r--src/egl/main/eglmisc.h3
-rw-r--r--src/egl/main/eglmode.c3
-rw-r--r--src/egl/main/eglscreen.c1
-rw-r--r--src/egl/main/eglscreen.h3
-rw-r--r--src/egl/main/eglsurface.c2
-rw-r--r--src/egl/main/egltypedefs.h4
24 files changed, 28 insertions, 21 deletions
diff --git a/src/egl/drivers/glx/egl_glx.c b/src/egl/drivers/glx/egl_glx.c
index 1c38db6491..af653b86ee 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 2ca9ea8a5b..10f7a31f5b 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 7e77ef1f03..364ad9c458 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 a7600820f3..c3676ec56a 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 2db9b9401a..b974e40cce 100644
--- a/src/egl/main/eglconfig.c
+++ b/src/egl/main/eglconfig.c
@@ -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"
diff --git a/src/egl/main/eglconfigutil.c b/src/egl/main/eglconfigutil.c
index ddb886c54d..e416b190f0 100644
--- a/src/egl/main/eglconfigutil.c
+++ b/src/egl/main/eglconfigutil.c
@@ -4,7 +4,6 @@
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include "eglconfigutil.h"
diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c
index 4496f76ece..ee9d60e17a 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 4811e3bb7a..ebb50aa60e 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 696d04e8ba..a19dcf4096 100644
--- a/src/egl/main/eglcurrent.c
+++ b/src/egl/main/eglcurrent.c
@@ -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() */
diff --git a/src/egl/main/eglcurrent.h b/src/egl/main/eglcurrent.h
index c169c93e94..e5c94ce60a 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 d7a8d14292..5897372fc5 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 4aea10c3eb..b04b094d84 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 1dadbf783b..df36369ac2 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 6ebb60a8f1..5149acd964 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 9c4902621f..5182b18e22 100644
--- a/src/egl/main/eglglobals.c
+++ b/src/egl/main/eglglobals.c
@@ -1,6 +1,7 @@
#include <stdlib.h>
#include <assert.h>
#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 5ebb914ca7..cd1dd5851b 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 3a99bfea4b..03bef2670f 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 5726f5bca8..907a057b44 100644
--- a/src/egl/main/eglmisc.c
+++ b/src/egl/main/eglmisc.c
@@ -33,7 +33,7 @@
#include <assert.h>
#include <string.h>
-#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 829d4cde79..5e6a2d41df 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 0f3ba6e5c0..503b9e595e 100644
--- a/src/egl/main/eglmode.c
+++ b/src/egl/main/eglmode.c
@@ -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"
diff --git a/src/egl/main/eglscreen.c b/src/egl/main/eglscreen.c
index 14a1e9f8fe..1079a1cbe6 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 d52e5388c3..c400ac3d15 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 3219231ed2..8f87239fe2 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 e6b19b35d0..e0c95762c6 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 */
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 13:10:22 +0000