diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 1 | ||||
| -rwxr-xr-x | make/egl.cfg | 18 | ||||
| -rwxr-xr-x | make/stub_includes/gluegen_egl/EGL/eglplatform.h | 9 |
3 files changed, 22 insertions, 6 deletions
diff --git a/make/build.xml b/make/build.xml index 981070dba..74ba34337 100644 --- a/make/build.xml +++ b/make/build.xml @@ -635,6 +635,7 @@ <target name="java.generate.window.system"> <!-- Generate WGL/GLX/CGL/EGL implementation class --> + <!-- FIXME: should probably always generate the EGL binding at this point --> <echo message="Generating WGL/GLX/CGL/EGL implementation class" /> <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes.fileset.platform.params}" /> <gluegen src="${stub.includes.platform}/window-system.c" diff --git a/make/egl.cfg b/make/egl.cfg index 7cda3b8c8..f699f7515 100755 --- a/make/egl.cfg +++ b/make/egl.cfg @@ -64,9 +64,13 @@ ForceProcAddressGen eglGetProcAddress # Treat all of the EGL types as opaque longs # Opaque long EGLConfig -# Opaque long EGLContext -# Opaque long EGLDisplay -# Opaque long EGLSurface +Opaque long EGLContext +Opaque long EGLDisplay +Opaque long EGLSurface +Opaque long EGLNativeDisplayType +Opaque long EGLNativeWindowType +Opaque long EGLNativePixmapType + # Opaque long EGLClientBuffer CustomCCode #include <EGL/egl.h> @@ -81,3 +85,11 @@ CustomCCode #include <inttypes.h> CustomCCode #endif CustomJavaCode EGL private static EGLProcAddressTable _table = new EGLProcAddressTable(); + +# There are some #defines in egl.h that GlueGen and PCPP don't currently handle +CustomJavaCode EGL public static final long EGL_DEFAULT_DISPLAY = 0; +CustomJavaCode EGL public static final long EGL_NO_CONTEXT = 0; +CustomJavaCode EGL public static final long EGL_NO_DISPLAY = 0; +CustomJavaCode EGL public static final long EGL_NO_SURFACE = 0; +CustomJavaCode EGL public static final int EGL_DONT_CARE = -1; +CustomJavaCode EGL public static final int EGL_UNKNOWN = -1; diff --git a/make/stub_includes/gluegen_egl/EGL/eglplatform.h b/make/stub_includes/gluegen_egl/EGL/eglplatform.h index 4a32edeef..28dba6bee 100755 --- a/make/stub_includes/gluegen_egl/EGL/eglplatform.h +++ b/make/stub_includes/gluegen_egl/EGL/eglplatform.h @@ -46,9 +46,12 @@ extern "C" { #define EGLAPI // Define native window system types -typedef int EGLNativeDisplayType; -typedef void* EGLNativeWindowType; -typedef void* EGLNativePixmapType; +typedef struct {} _EGLNativeDisplayType; +typedef struct {} _EGLNativeWindowType; +typedef struct {} _EGLNativePixmapType; +typedef _EGLNativeDisplayType* EGLNativeDisplayType; +typedef _EGLNativeWindowType* EGLNativeWindowType; +typedef _EGLNativePixmapType* EGLNativePixmapType; #ifdef __cplusplus } |