Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[mesa.git] / src / egl / main / egltypedefs.h

diff --git a/src/egl/main/egltypedefs.h b/src/egl/main/egltypedefs.h
index 0a5ab7ad89782ca0e1e96c3c9483ae4bc8b0e781..4461440b9b72da14e44056403a1149bd5632961a 100644 (file)
--- a/src/egl/main/egltypedefs.h
+++ b/src/egl/main/egltypedefs.h
@@ -1,9 +1,12 @@
 #ifndef EGLTYPEDEFS_INCLUDED
 #define EGLTYPEDEFS_INCLUDED
 
+#define EGL_EGLEXT_PROTOTYPES
 
-#include <GLES/egl.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
 
+#include "eglcompiler.h"
 
 typedef struct _egl_api _EGLAPI;
 
@@ -15,16 +18,18 @@ typedef struct _egl_display _EGLDisplay;
 
 typedef struct _egl_driver _EGLDriver;
 
+typedef struct _egl_extensions _EGLExtensions;
+
 typedef struct _egl_mode _EGLMode;
 
 typedef struct _egl_screen _EGLScreen;
 
 typedef struct _egl_surface _EGLSurface;
 
+typedef struct _egl_thread_info _EGLThreadInfo;
 
-typedef void (*_EGLProc)();
 
-typedef _EGLDriver *(*_EGLMain_t)(_EGLDisplay *dpy);
+typedef _EGLDriver *(*_EGLMain_t)(const char *args);
 
 
 #endif /* EGLTYPEDEFS_INCLUDED */