- EGL/EGLExt

    - Migrated gluegen_egl with egl for easier maintenance
    - Updated egl header to NV latest incl extensions
    - Added common stdint helper


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1790 232f8b59-042b-4e1e-8c03-345bb8c30851

12 files changed, 326 insertions, 840 deletions

diff --git a/make/build.xml b/make/build.xml
index 0dddeb43c..90b5ec986 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -492,7 +492,7 @@
         <!-- Prepare to build the EGL interface -->
         <property name="window.es.cfg"                             value="${config}/egl.cfg" />
         <property name="window.es.ext.cfg"                         value="${config}/eglext.cfg" />
-        <property name="window.es.system"                          value="gluegen_egl"/>
+        <property name="window.es.system"                          value="egl"/>
     </target>
 
     <target name="declare.gl.gl2" unless="jogl.nogl2">
@@ -737,7 +737,7 @@
 
     <target name="java.generate.window.system.es" if="window.es.cfg" unless="jogl.noes">
         <echo message="Generating EGL implementation class" />
-        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes.dir}/${window.es.system}/**" />
+        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes.dir}/${window.es.system}/** ${stub.includes.dir}/common/**" />
         <gluegen src="${stub.includes.dir}/${window.es.system}/window-system.c"
                  config="${window.es.cfg}"
                  includeRefid="stub.includes.fileset.platform"
@@ -748,7 +748,7 @@
 
     <target name="java.generate.window.system.es.ext" if="window.es.ext.cfg" unless="jogl.noes">
         <echo message="Generating EGLExt implementation class" />
-        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes.dir}/${window.es.system}/**" />
+        <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes.dir}/${window.es.system}/** ${stub.includes.dir}/common/**" />
         <gluegen src="${stub.includes.dir}/${window.es.system}/window-system-ext.c"
                  config="${window.es.ext.cfg}"
                  includeRefid="stub.includes.fileset.platform"
diff --git a/make/egl.cfg b/make/egl.cfg
index 8d133f349..d10c6be51 100755
--- a/make/egl.cfg
+++ b/make/egl.cfg
@@ -10,10 +10,6 @@ Style allstatic
 
 HierarchicalNativeOutput false
 Include gl-common.cfg
-Include gl-common-extensions.cfg
-
-# There are a few routines we don't handle yet
-Ignore glGetBufferPointerv
 
 # Use a ProcAddressTable so we dynamically look up the routines
 EmitProcAddressTable true
diff --git a/make/eglext.cfg b/make/eglext.cfg
index 57e510908..a4c85d8c4 100755
--- a/make/eglext.cfg
+++ b/make/eglext.cfg
@@ -13,10 +13,6 @@ ImplJavaClass EGLExtImpl
 ExtendedInterfaceSymbols ../build/gensrc/classes/com/sun/opengl/impl/egl/EGL.java
 HierarchicalNativeOutput false
 Include gl-common.cfg
-Include gl-common-extensions.cfg
-
-# There are a few routines we don't handle yet
-Ignore glGetBufferPointerv
 
 # Use a ProcAddressTable so we dynamically look up the routines
 EmitProcAddressTable true
@@ -53,6 +49,11 @@ Opaque long EGLNativeWindowType
 Opaque long EGLNativePixmapType
 Opaque long EGLClientBuffer
 Opaque long EGLImageKHR
+#Opaque long EGLPerfMonitorNV
+#Opaque long EGLPerfCounterNV
+#Opaque long EGLPerfMarkerNV
+Opaque long EGLSyncKHR
+Opaque long NativeSyncKHR
 
 # Opaque long EGLClientBuffer
 
@@ -66,6 +67,8 @@ Include intptr.cfg
 
 # There are some #defines in eglext.h that GlueGen and PCPP don't currently handle
 CustomJavaCode EGLExt      public static final long EGL_NO_IMAGE = 0;
+CustomJavaCode EGLExt      public static final long EGL_NO_PERFMONITOR = 0;
+CustomJavaCode EGLExt      public static final long EGL_DEFAULT_PERFMARKER = 0;
 CustomJavaCode EGLExt      public boolean isFunctionAvailable(String glFunctionName);
 CustomJavaCode EGLExt      public boolean isExtensionAvailable(String glExtensionName);
 
diff --git a/make/stub_includes/common/stdint.h b/make/stub_includes/common/stdint.h
new file mode 100644
index 000000000..65e7fc22c
--- /dev/null
+++ b/make/stub_includes/common/stdint.h
@@ -0,0 +1,17 @@
+#if defined(_WIN32)
+    #error windows does not support stdint.h
+    // typedef signed   __int32 int32_t;
+    // typedef unsigned __int32 uint32_t;
+    // typedef signed   __int64 int64_t;
+    // typedef unsigned __int64 uint64_t;
+#else
+    typedef signed   int  int32_t;
+    typedef unsigned int uint32_t;
+    #if defined(__ia64__) || defined(__x86_64__)
+        typedef signed   long int  int64_t;
+        typedef unsigned long int uint64_t;
+    #else
+        typedef signed   long long int  int64_t;
+        typedef unsigned long long int uint64_t;
+    #endif
+#endif
diff --git a/make/stub_includes/egl/EGL/egl.h b/make/stub_includes/egl/EGL/egl.h
index 6bfcc3200..86ca4818f 100755
--- a/make/stub_includes/egl/EGL/egl.h
+++ b/make/stub_includes/egl/EGL/egl.h
@@ -1,40 +1,7 @@
 /* -*- mode: c; tab-width: 8; -*- */
 /* vi: set sw=4 ts=8: */
-/* Reference version of egl.h for EGL 1.3.
- * Last modified 2006/11/12
- */
-
-/* 
-* Copyright (c) 2007 The Khronos Group Inc. 
-* 
-* Permission is hereby granted, free of charge, to any person obtaining 
-* a copy of this software and associated documentation files (the 
-* "Software"), to deal in the Software without restriction, including 
-* without limitation the rights to use, copy, modify, merge, publish, 
-* distribute, sublicense, and/or sell copies of the Software, and to 
-* permit persons to whom the Software is furnished to do so, subject 
-* to the following conditions: 
-* The above copyright notice and this permission notice shall be included 
-* in all copies or substantial portions of the Software. 
-* 
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
-* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-* 
-*/ 
-
-/*
- * Copyright (c) 2007 NVIDIA Corporation.  All rights reserved.
- *
- * NVIDIA Corporation and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an express
- * license agreement from NVIDIA Corporation is strictly prohibited.
+/* Reference version of egl.h for EGL 1.4.
+ * Last modified 2008/05/02
  */
 
 #ifndef __egl_h_
@@ -50,193 +17,209 @@ extern "C" {
 #endif
 
 /* EGL Types */
-typedef int EGLint;
+typedef int32_t EGLint;
 typedef unsigned int EGLBoolean;
 typedef unsigned int EGLenum;
-typedef void *EGLConfig;
+#ifdef USE_GLUEGEN
+    /* GlueGen currently needs this form of typedef to produce distinct
+       types for each of these pointer types */
+    typedef struct {} _EGLConfig, *EGLConfig;
+#else
+    typedef void *EGLConfig;
+#endif
 typedef void *EGLContext;
 typedef void *EGLDisplay;
 typedef void *EGLSurface;
 typedef void *EGLClientBuffer;
 
 /* EGL Versioning */
-#define EGL_VERSION_1_0             1
-#define EGL_VERSION_1_1             1
-#define EGL_VERSION_1_2             1
-#define EGL_VERSION_1_3             1
+#define EGL_VERSION_1_0			1
+#define EGL_VERSION_1_1			1
+#define EGL_VERSION_1_2			1
+#define EGL_VERSION_1_3			1
+#define EGL_VERSION_1_4			1
 
 /* EGL Enumerants. Bitmasks and other exceptional cases aside, most
  * enums are assigned unique values starting at 0x3000.
  */
 
 /* EGL aliases */
-#define EGL_FALSE                   0
-#define EGL_TRUE                    1
+#define EGL_FALSE			0
+#define EGL_TRUE			1
 
 /* Out-of-band handle values */
-#define EGL_DEFAULT_DISPLAY         ((EGLNativeDisplayType)0)
-#define EGL_NO_CONTEXT              ((EGLContext)0)
-#define EGL_NO_DISPLAY              ((EGLDisplay)0)
-#define EGL_NO_SURFACE              ((EGLSurface)0)
+#define EGL_DEFAULT_DISPLAY		((EGLNativeDisplayType)0)
+#define EGL_NO_CONTEXT			((EGLContext)0)
+#define EGL_NO_DISPLAY			((EGLDisplay)0)
+#define EGL_NO_SURFACE			((EGLSurface)0)
 
 /* Out-of-band attribute value */
-#define EGL_DONT_CARE               ((EGLint)-1)
+#define EGL_DONT_CARE			((EGLint)-1)
 
 /* Errors / GetError return values */
-#define EGL_SUCCESS                 0x3000
-#define EGL_NOT_INITIALIZED         0x3001
-#define EGL_BAD_ACCESS              0x3002
-#define EGL_BAD_ALLOC               0x3003
-#define EGL_BAD_ATTRIBUTE           0x3004
-#define EGL_BAD_CONFIG              0x3005
-#define EGL_BAD_CONTEXT             0x3006
-#define EGL_BAD_CURRENT_SURFACE     0x3007
-#define EGL_BAD_DISPLAY             0x3008
-#define EGL_BAD_MATCH               0x3009
-#define EGL_BAD_NATIVE_PIXMAP       0x300A
-#define EGL_BAD_NATIVE_WINDOW       0x300B
-#define EGL_BAD_PARAMETER           0x300C
-#define EGL_BAD_SURFACE             0x300D
-#define EGL_CONTEXT_LOST            0x300E    /* EGL 1.1 - IMG_power_management */
+#define EGL_SUCCESS			0x3000
+#define EGL_NOT_INITIALIZED		0x3001
+#define EGL_BAD_ACCESS			0x3002
+#define EGL_BAD_ALLOC			0x3003
+#define EGL_BAD_ATTRIBUTE		0x3004
+#define EGL_BAD_CONFIG			0x3005
+#define EGL_BAD_CONTEXT			0x3006
+#define EGL_BAD_CURRENT_SURFACE		0x3007
+#define EGL_BAD_DISPLAY			0x3008
+#define EGL_BAD_MATCH			0x3009
+#define EGL_BAD_NATIVE_PIXMAP		0x300A
+#define EGL_BAD_NATIVE_WINDOW		0x300B
+#define EGL_BAD_PARAMETER		0x300C
+#define EGL_BAD_SURFACE			0x300D
+#define EGL_CONTEXT_LOST		0x300E	/* EGL 1.1 - IMG_power_management */
 
 /* Reserved 0x300F-0x301F for additional errors */
 
 /* Config attributes */
-#define EGL_BUFFER_SIZE             0x3020
-#define EGL_ALPHA_SIZE              0x3021
-#define EGL_BLUE_SIZE               0x3022
-#define EGL_GREEN_SIZE              0x3023
-#define EGL_RED_SIZE                0x3024
-#define EGL_DEPTH_SIZE              0x3025
-#define EGL_STENCIL_SIZE            0x3026
-#define EGL_CONFIG_CAVEAT           0x3027
-#define EGL_CONFIG_ID               0x3028
-#define EGL_LEVEL                   0x3029
-#define EGL_MAX_PBUFFER_HEIGHT      0x302A
-#define EGL_MAX_PBUFFER_PIXELS      0x302B
-#define EGL_MAX_PBUFFER_WIDTH       0x302C
-#define EGL_NATIVE_RENDERABLE       0x302D
-#define EGL_NATIVE_VISUAL_ID        0x302E
-#define EGL_NATIVE_VISUAL_TYPE      0x302F
-#define EGL_PRESERVED_RESOURCES     0x3030
-#define EGL_SAMPLES                 0x3031
-#define EGL_SAMPLE_BUFFERS          0x3032
-#define EGL_SURFACE_TYPE            0x3033
-#define EGL_TRANSPARENT_TYPE        0x3034
-#define EGL_TRANSPARENT_BLUE_VALUE  0x3035
-#define EGL_TRANSPARENT_GREEN_VALUE 0x3036
-#define EGL_TRANSPARENT_RED_VALUE   0x3037
-#define EGL_NONE                    0x3038    /* Attrib list terminator */
-#define EGL_BIND_TO_TEXTURE_RGB     0x3039
-#define EGL_BIND_TO_TEXTURE_RGBA    0x303A
-#define EGL_MIN_SWAP_INTERVAL       0x303B
-#define EGL_MAX_SWAP_INTERVAL       0x303C
-#define EGL_LUMINANCE_SIZE          0x303D
-#define EGL_ALPHA_MASK_SIZE         0x303E
-#define EGL_COLOR_BUFFER_TYPE       0x303F
-#define EGL_RENDERABLE_TYPE         0x3040
-#define EGL_MATCH_NATIVE_PIXMAP     0x3041    /* Pseudo-attribute (not queryable) */
-#define EGL_CONFORMANT              0x3042
+#define EGL_BUFFER_SIZE			0x3020
+#define EGL_ALPHA_SIZE			0x3021
+#define EGL_BLUE_SIZE			0x3022
+#define EGL_GREEN_SIZE			0x3023
+#define EGL_RED_SIZE			0x3024
+#define EGL_DEPTH_SIZE			0x3025
+#define EGL_STENCIL_SIZE		0x3026
+#define EGL_CONFIG_CAVEAT		0x3027
+#define EGL_CONFIG_ID			0x3028
+#define EGL_LEVEL			0x3029
+#define EGL_MAX_PBUFFER_HEIGHT		0x302A
+#define EGL_MAX_PBUFFER_PIXELS		0x302B
+#define EGL_MAX_PBUFFER_WIDTH		0x302C
+#define EGL_NATIVE_RENDERABLE		0x302D
+#define EGL_NATIVE_VISUAL_ID		0x302E
+#define EGL_NATIVE_VISUAL_TYPE		0x302F
+#define EGL_PRESERVED_RESOURCES		0x3030
+#define EGL_SAMPLES			0x3031
+#define EGL_SAMPLE_BUFFERS		0x3032
+#define EGL_SURFACE_TYPE		0x3033
+#define EGL_TRANSPARENT_TYPE		0x3034
+#define EGL_TRANSPARENT_BLUE_VALUE	0x3035
+#define EGL_TRANSPARENT_GREEN_VALUE	0x3036
+#define EGL_TRANSPARENT_RED_VALUE	0x3037
+#define EGL_NONE			0x3038	/* Attrib list terminator */
+#define EGL_BIND_TO_TEXTURE_RGB		0x3039
+#define EGL_BIND_TO_TEXTURE_RGBA	0x303A
+#define EGL_MIN_SWAP_INTERVAL		0x303B
+#define EGL_MAX_SWAP_INTERVAL		0x303C
+#define EGL_LUMINANCE_SIZE		0x303D
+#define EGL_ALPHA_MASK_SIZE		0x303E
+#define EGL_COLOR_BUFFER_TYPE		0x303F
+#define EGL_RENDERABLE_TYPE		0x3040
+#define EGL_MATCH_NATIVE_PIXMAP		0x3041	/* Pseudo-attribute (not queryable) */
+#define EGL_CONFORMANT			0x3042
 
 /* Reserved 0x3041-0x304F for additional config attributes */
 
 /* Config attribute values */
-#define EGL_SLOW_CONFIG             0x3050    /* EGL_CONFIG_CAVEAT value */
-#define EGL_NON_CONFORMANT_CONFIG   0x3051    /* EGL_CONFIG_CAVEAT value */
-#define EGL_TRANSPARENT_RGB         0x3052    /* EGL_TRANSPARENT_TYPE value */
-#define EGL_RGB_BUFFER              0x308E    /* EGL_COLOR_BUFFER_TYPE value */
-#define EGL_LUMINANCE_BUFFER        0x308F    /* EGL_COLOR_BUFFER_TYPE value */
+#define EGL_SLOW_CONFIG			0x3050	/* EGL_CONFIG_CAVEAT value */
+#define EGL_NON_CONFORMANT_CONFIG	0x3051	/* EGL_CONFIG_CAVEAT value */
+#define EGL_TRANSPARENT_RGB		0x3052	/* EGL_TRANSPARENT_TYPE value */
+#define EGL_RGB_BUFFER			0x308E	/* EGL_COLOR_BUFFER_TYPE value */
+#define EGL_LUMINANCE_BUFFER		0x308F	/* EGL_COLOR_BUFFER_TYPE value */
 
 /* More config attribute values, for EGL_TEXTURE_FORMAT */
-#define EGL_NO_TEXTURE              0x305C
-#define EGL_TEXTURE_RGB             0x305D
-#define EGL_TEXTURE_RGBA            0x305E
-#define EGL_TEXTURE_2D              0x305F
+#define EGL_NO_TEXTURE			0x305C
+#define EGL_TEXTURE_RGB			0x305D
+#define EGL_TEXTURE_RGBA		0x305E
+#define EGL_TEXTURE_2D			0x305F
 
 /* Config attribute mask bits */
-#define EGL_PBUFFER_BIT                 0x0001    /* EGL_SURFACE_TYPE mask bits */
-#define EGL_PIXMAP_BIT                  0x0002    /* EGL_SURFACE_TYPE mask bits */
-#define EGL_WINDOW_BIT                  0x0004    /* EGL_SURFACE_TYPE mask bits */
-#define EGL_VG_COLORSPACE_LINEAR_BIT    0x0020 /* EGL_SURFACE_TYPE mask bits */
-#define EGL_VG_ALPHA_FORMAT_PRE_BIT     0x0040 /* EGL_SURFACE_TYPE mask bits */
-
-#define EGL_OPENGL_ES_BIT               0x0001    /* EGL_RENDERABLE_TYPE mask bits */
-#define EGL_OPENVG_BIT                  0x0002    /* EGL_RENDERABLE_TYPE mask bits */
-#define EGL_OPENGL_ES2_BIT              0x0004    /* EGL_RENDERABLE_TYPE mask bits */
+#define EGL_PBUFFER_BIT			0x0001	/* EGL_SURFACE_TYPE mask bits */
+#define EGL_PIXMAP_BIT			0x0002	/* EGL_SURFACE_TYPE mask bits */
+#define EGL_WINDOW_BIT			0x0004	/* EGL_SURFACE_TYPE mask bits */
+#define EGL_VG_COLORSPACE_LINEAR_BIT	0x0020	/* EGL_SURFACE_TYPE mask bits */
+#define EGL_VG_ALPHA_FORMAT_PRE_BIT	0x0040	/* EGL_SURFACE_TYPE mask bits */
+#define EGL_MULTISAMPLE_RESOLVE_BOX_BIT 0x0200	/* EGL_SURFACE_TYPE mask bits */
+#define EGL_SWAP_BEHAVIOR_PRESERVED_BIT 0x0400	/* EGL_SURFACE_TYPE mask bits */
+
+#define EGL_OPENGL_ES_BIT		0x0001	/* EGL_RENDERABLE_TYPE mask bits */
+#define EGL_OPENVG_BIT			0x0002	/* EGL_RENDERABLE_TYPE mask bits */
+#define EGL_OPENGL_ES2_BIT		0x0004	/* EGL_RENDERABLE_TYPE mask bits */
+#define EGL_OPENGL_BIT			0x0008	/* EGL_RENDERABLE_TYPE mask bits */
 
 /* QueryString targets */
-#define EGL_VENDOR                  0x3053
-#define EGL_VERSION                 0x3054
-#define EGL_EXTENSIONS              0x3055
-#define EGL_CLIENT_APIS             0x308D
-
-/* QuerySurface / CreatePbufferSurface targets */
-#define EGL_HEIGHT                  0x3056
-#define EGL_WIDTH                   0x3057
-#define EGL_LARGEST_PBUFFER         0x3058
-#define EGL_TEXTURE_FORMAT          0x3080
-#define EGL_TEXTURE_TARGET          0x3081
-#define EGL_MIPMAP_TEXTURE          0x3082
-#define EGL_MIPMAP_LEVEL            0x3083
-#define EGL_RENDER_BUFFER           0x3086
-#define EGL_VG_COLORSPACE           0x3087
-#define EGL_VG_ALPHA_FORMAT         0x3088
-#define EGL_HORIZONTAL_RESOLUTION   0x3090
-#define EGL_VERTICAL_RESOLUTION     0x3091
-#define EGL_PIXEL_ASPECT_RATIO      0x3092
-#define EGL_SWAP_BEHAVIOR           0x3093
+#define EGL_VENDOR			0x3053
+#define EGL_VERSION			0x3054
+#define EGL_EXTENSIONS			0x3055
+#define EGL_CLIENT_APIS			0x308D
+
+/* QuerySurface / SurfaceAttrib / CreatePbufferSurface targets */
+#define EGL_HEIGHT			0x3056
+#define EGL_WIDTH			0x3057
+#define EGL_LARGEST_PBUFFER		0x3058
+#define EGL_TEXTURE_FORMAT		0x3080
+#define EGL_TEXTURE_TARGET		0x3081
+#define EGL_MIPMAP_TEXTURE		0x3082
+#define EGL_MIPMAP_LEVEL		0x3083
+#define EGL_RENDER_BUFFER		0x3086
+#define EGL_VG_COLORSPACE		0x3087
+#define EGL_VG_ALPHA_FORMAT		0x3088
+#define EGL_HORIZONTAL_RESOLUTION	0x3090
+#define EGL_VERTICAL_RESOLUTION		0x3091
+#define EGL_PIXEL_ASPECT_RATIO		0x3092
+#define EGL_SWAP_BEHAVIOR		0x3093
+#define EGL_MULTISAMPLE_RESOLVE		0x3099
 
 /* EGL_RENDER_BUFFER values / BindTexImage / ReleaseTexImage buffer targets */
-#define EGL_BACK_BUFFER             0x3084
-#define EGL_SINGLE_BUFFER           0x3085
+#define EGL_BACK_BUFFER			0x3084
+#define EGL_SINGLE_BUFFER		0x3085
 
 /* OpenVG color spaces */
-#define EGL_VG_COLORSPACE_sRGB      0x3089    /* EGL_VG_COLORSPACE value */
-#define EGL_VG_COLORSPACE_LINEAR    0x308A    /* EGL_VG_COLORSPACE value */
+#define EGL_VG_COLORSPACE_sRGB		0x3089	/* EGL_VG_COLORSPACE value */
+#define EGL_VG_COLORSPACE_LINEAR	0x308A	/* EGL_VG_COLORSPACE value */
 
 /* OpenVG alpha formats */
-#define EGL_VG_ALPHA_FORMAT_NONPRE  0x308B    /* EGL_VG_ALPHA_FORMAT value */
-#define EGL_VG_ALPHA_FORMAT_PRE     0x308C    /* EGL_VG_ALPHA_FORMAT value */
+#define EGL_VG_ALPHA_FORMAT_NONPRE	0x308B	/* EGL_ALPHA_FORMAT value */
+#define EGL_VG_ALPHA_FORMAT_PRE		0x308C	/* EGL_ALPHA_FORMAT value */
 
 /* Constant scale factor by which fractional display resolutions &
  * aspect ratio are scaled when queried as integer values.
  */
-#define EGL_DISPLAY_SCALING         10000
+#define EGL_DISPLAY_SCALING		10000
 
 /* Unknown display resolution/aspect ratio */
-#define EGL_UNKNOWN                 ((EGLint)-1)
+#define EGL_UNKNOWN			((EGLint)-1)
 
 /* Back buffer swap behaviors */
-#define EGL_BUFFER_PRESERVED        0x3094    /* EGL_SWAP_BEHAVIOR value */
-#define EGL_BUFFER_DESTROYED        0x3095    /* EGL_SWAP_BEHAVIOR value */
+#define EGL_BUFFER_PRESERVED		0x3094	/* EGL_SWAP_BEHAVIOR value */
+#define EGL_BUFFER_DESTROYED		0x3095	/* EGL_SWAP_BEHAVIOR value */
 
 /* CreatePbufferFromClientBuffer buffer types */
-#define EGL_OPENVG_IMAGE            0x3096
+#define EGL_OPENVG_IMAGE		0x3096
 
 /* QueryContext targets */
-#define EGL_CONTEXT_CLIENT_TYPE     0x3097
+#define EGL_CONTEXT_CLIENT_TYPE		0x3097
 
 /* CreateContext attributes */
-#define EGL_CONTEXT_CLIENT_VERSION  0x3098
+#define EGL_CONTEXT_CLIENT_VERSION	0x3098
+
+/* Multisample resolution behaviors */
+#define EGL_MULTISAMPLE_RESOLVE_DEFAULT 0x309A	/* EGL_MULTISAMPLE_RESOLVE value */
+#define EGL_MULTISAMPLE_RESOLVE_BOX	0x309B	/* EGL_MULTISAMPLE_RESOLVE value */
 
 /* BindAPI/QueryAPI targets */
-#define EGL_OPENGL_ES_API           0x30A0
-#define EGL_OPENVG_API              0x30A1
+#define EGL_OPENGL_ES_API		0x30A0
+#define EGL_OPENVG_API			0x30A1
+#define EGL_OPENGL_API			0x30A2
 
 /* GetCurrentSurface targets */
-#define EGL_DRAW                    0x3059
-#define EGL_READ                    0x305A
+#define EGL_DRAW			0x3059
+#define EGL_READ			0x305A
 
 /* WaitNative engines */
-#define EGL_CORE_NATIVE_ENGINE      0x305B
+#define EGL_CORE_NATIVE_ENGINE		0x305B
 
 /* EGL 1.2 tokens renamed for consistency in EGL 1.3 */
-#define EGL_COLORSPACE              EGL_VG_COLORSPACE
-#define EGL_ALPHA_FORMAT            EGL_VG_ALPHA_FORMAT
-#define EGL_COLORSPACE_sRGB         EGL_VG_COLORSPACE_sRGB
-#define EGL_COLORSPACE_LINEAR       EGL_VG_COLORSPACE_LINEAR
-#define EGL_ALPHA_FORMAT_NONPRE     EGL_VG_ALPHA_FORMAT_NONPRE
-#define EGL_ALPHA_FORMAT_PRE        EGL_VG_ALPHA_FORMAT_PRE
+#define EGL_COLORSPACE			EGL_VG_COLORSPACE
+#define EGL_ALPHA_FORMAT		EGL_VG_ALPHA_FORMAT
+#define EGL_COLORSPACE_sRGB		EGL_VG_COLORSPACE_sRGB
+#define EGL_COLORSPACE_LINEAR		EGL_VG_COLORSPACE_LINEAR
+#define EGL_ALPHA_FORMAT_NONPRE		EGL_VG_ALPHA_FORMAT_NONPRE
+#define EGL_ALPHA_FORMAT_PRE		EGL_VG_ALPHA_FORMAT_PRE
 
 /* EGL extensions must request enum blocks from the Khronos
  * API Registrar, who maintains the enumerant registry. Submit
@@ -256,24 +239,24 @@ EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy);
 EGLAPI const char * EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name);
 
 EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs,
-             EGLint config_size, EGLint *num_config);
+			 EGLint config_size, EGLint *num_config);
 EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list,
-               EGLConfig *configs, EGLint config_size,
-               EGLint *num_config);
+			   EGLConfig *configs, EGLint config_size,
+			   EGLint *num_config);
 EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config,
-                  EGLint attribute, EGLint *value);
+			      EGLint attribute, EGLint *value);
 
 EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config,
-                  EGLNativeWindowType win,
-                  const EGLint *attrib_list);
+				  EGLNativeWindowType win,
+				  const EGLint *attrib_list);
 EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config,
-                   const EGLint *attrib_list);
+				   const EGLint *attrib_list);
 EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config,
-                  EGLNativePixmapType pixmap,
-                  const EGLint *attrib_list);
+				  EGLNativePixmapType pixmap,
+				  const EGLint *attrib_list);
 EGLAPI EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface);
 EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface,
-               EGLint attribute, EGLint *value);
+			   EGLint attribute, EGLint *value);
 
 EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api);
 EGLAPI EGLenum EGLAPIENTRY eglQueryAPI(void);
@@ -283,11 +266,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient(void);
 EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread(void);
 
 EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(
-          EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer,
-          EGLConfig config, const EGLint *attrib_list);
+	      EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer,
+	      EGLConfig config, const EGLint *attrib_list);
 
 EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface,
-                EGLint attribute, EGLint value);
+			    EGLint attribute, EGLint value);
 EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
 EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
 
@@ -296,23 +279,23 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval);
 
 
 EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config,
-                EGLContext share_context,
-                const EGLint *attrib_list);
+			    EGLContext share_context,
+			    const EGLint *attrib_list);
 EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx);
 EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw,
-              EGLSurface read, EGLContext ctx);
+			  EGLSurface read, EGLContext ctx);
 
 EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext(void);
 EGLAPI EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw);
 EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void);
 EGLAPI EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx,
-               EGLint attribute, EGLint *value);
+			   EGLint attribute, EGLint *value);
 
 EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL(void);
 EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine);
 EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface);
 EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface,
-              EGLNativePixmapType target);
+			  EGLNativePixmapType target);
 
 typedef void (* EGLAPIENTRY __EGLFuncPtr)(void);
 EGLAPI __EGLFuncPtr eglGetProcAddress(const char *procname);
diff --git a/make/stub_includes/egl/EGL/eglext.h b/make/stub_includes/egl/EGL/eglext.h
index c3f637754..5b41bfae6 100755
--- a/make/stub_includes/egl/EGL/eglext.h
+++ b/make/stub_includes/egl/EGL/eglext.h
@@ -29,7 +29,7 @@ extern "C" {
 */
 
 /*
- * Copyright (c) 2007 NVIDIA Corporation.  All rights reserved.
+ * Copyright (c) 2008 NVIDIA Corporation.  All rights reserved.
  *
  * NVIDIA Corporation and its licensors retain all intellectual property
  * and proprietary rights in and to this software, related documentation
@@ -145,6 +145,7 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL
 /* eglCreateImageKHR target and eglCreatePbufferFromClientBuffer buftype */
 
 /* EGL_NV_perfmon */
+#if 0
 #ifndef EGL_NV_perfmon
 #define EGL_NV_perfmon 1
 #define EGL_PERFMONITOR_HARDWARE_COUNTERS_BIT_NV    0x00000001
@@ -162,9 +163,58 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL
 #define EGL_NO_PERFMONITOR_NV ((EGLPerfMonitorNV)0)
 #define EGL_DEFAULT_PERFMARKER_NV ((EGLPerfMarkerNV)0)
 typedef void *EGLPerfMonitorNV;
-typedef void *EGLPerfCounterNV;
 typedef void *EGLPerfMarkerNV;
+#ifdef USE_GLUEGEN
+    /* GlueGen currently needs this form of typedef to produce distinct
+       types for each of these pointer types */
+    typedef struct {} _EGLPerfCounterNV, *EGLPerfCounterNV;
+#else
+    typedef void *EGLPerfCounterNV;
 #endif
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLPerfMonitorNV EGLAPIENTRY eglCreatePerfMonitorNV(EGLDisplay dpy, EGLint mask);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroyPerfMonitorNV(EGLDisplay dpy, EGLPerfMonitorNV monitor);
+EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrentPerfMonitorNV(EGLPerfMonitorNV monitor);
+EGLAPI EGLPerfMonitorNV EGLAPIENTRY eglGetCurrentPerfMonitorNV(void);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetPerfCountersNV(EGLPerfMonitorNV monitor, EGLPerfCounterNV *counters, EGLint counter_size, EGLint *num_counter);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetPerfCounterAttribNV(EGLPerfMonitorNV monitor, EGLPerfCounterNV counter, EGLint pname, EGLint *value);
+EGLAPI const char * EGLAPIENTRY eglQueryPerfCounterStringNV(EGLPerfMonitorNV monitor, EGLPerfCounterNV counter, EGLint pname);
+EGLAPI EGLBoolean EGLAPIENTRY eglPerfMonitorAddCountersNV(EGLint n, const EGLPerfCounterNV *counters);
+EGLAPI EGLBoolean EGLAPIENTRY eglPerfMonitorRemoveCountersNV(EGLint n, const EGLPerfCounterNV *counters);
+EGLAPI EGLBoolean EGLAPIENTRY eglPerfMonitorRemoveAllCountersNV(void);
+EGLAPI EGLBoolean EGLAPIENTRY eglPerfMonitorBeginExperimentNV(void);
+EGLAPI EGLBoolean EGLAPIENTRY eglPerfMonitorEndExperimentNV(void);
+EGLAPI EGLBoolean EGLAPIENTRY eglPerfMonitorBeginPassNV(EGLint n);
+EGLAPI EGLBoolean EGLAPIENTRY eglPerfMonitorEndPassNV(void);
+EGLAPI EGLPerfMarkerNV EGLAPIENTRY eglCreatePerfMarkerNV(void);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroyPerfMarkerNV(EGLPerfMarkerNV marker);
+EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrentPerfMarkerNV(EGLPerfMarkerNV marker);
+EGLAPI EGLPerfMarkerNV EGLAPIENTRY eglGetCurrentPerfMarkerNV(void);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetPerfMarkerCounterNV(EGLPerfMarkerNV marker, EGLPerfCounterNV counter, EGLuint64NV *value, EGLuint64NV *cycles);
+EGLAPI EGLBoolean EGLAPIENTRY eglValidatePerfMonitorNV(EGLint *num_passes);
+#endif
+typedef EGLPerfMonitorNV (EGLAPIENTRYP PFNEGLCREATEPERFMONITORNVPROC)(EGLDisplay dpy, EGLint mask);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYPERFMONITORNVPROC)(EGLDisplay dpy, EGLPerfMonitorNV monitor);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLMAKECURRENTPERFMONITORNVPROC)(EGLPerfMonitorNV monitor);
+typedef EGLPerfMonitorNV (EGLAPIENTRYP PFNEGLGETCURRENTPERFMONITORNVPROC)(void);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETPERFCOUNTERSNVPROC)(EGLPerfMonitorNV monitor, EGLPerfCounterNV *counters, EGLint counter_size, EGLint *num_counter);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETPERFCOUNTERATTRIBNVPROC)(EGLPerfMonitorNV monitor, EGLPerfCounterNV counter, EGLint pname, EGLint *value);
+typedef const char * (EGLAPIENTRYP PFNEGLQUERYPERFCOUNTERSTRINGNVPROC)(EGLPerfMonitorNV monitor, EGLPerfCounterNV counter, EGLint pname);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLPERFMONITORADDCOUNTERSNVPROC)(EGLint n, const EGLPerfCounterNV *counters);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLPERFMONITORREMOVECOUNTERSNVPROC)(EGLint n, const EGLPerfCounterNV *counters);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLPERFMONITORREMOVEALLCOUNTERSNVPROC)(void);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLPERFMONITORBEGINEXPERIMENTNVPROC)(void);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLPERFMONITORENDEXPERIMENTNVPROC)(void);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLPERFMONITORBEGINPASSNVPROC)(EGLint n);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLPERFMONITORENDPASSNVPROC)(void);
+typedef EGLPerfMarkerNV (EGLAPIENTRYP PFNEGLCREATEPERFMARKERNVPROC)(void);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYPERFMARKERNVPROC)(EGLPerfMarkerNV marker);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLMAKECURRENTPERFMARKERNVPROC)(EGLPerfMarkerNV marker);
+typedef EGLPerfMarkerNV (EGLAPIENTRYP PFNEGLGETCURRENTPERFMARKERNVPROC)(void);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETPERFMARKERCOUNTERNVPROC)(EGLPerfMarkerNV marker, EGLPerfCounterNV counter, EGLuint64NV *value, EGLuint64NV *cycles);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLVALIDATEPERFMONITORNVPROC)(EGLint *num_passes);
+#endif
+#endif // exclude EGL_NV_perfmon
 
 /* EGL_NV_texture_rectangle (reuse analagous WGL enum) */
 #ifndef EGL_NV_texture_rectangle
@@ -175,6 +225,12 @@ typedef void *EGLPerfMarkerNV;
 
 #ifndef EGL_NV_system_time
 #define EGL_NV_system_time 1
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeFrequencyNV(void);
+EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV(void);
+#endif
+typedef EGLuint64NV (EGLAPIENTRYP PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC)(void);
+typedef EGLuint64NV (EGLAPIENTRYP PFNEGLGETSYSTEMTIMENVPROC)(void);
 #endif
 
 /* EGL_NV_coverage_sample (reuse GLX_VIDEO_OUT_DEPTH_NV and
@@ -182,17 +238,17 @@ typedef void *EGLPerfMarkerNV;
  */
 #ifndef EGL_NV_coverage_sample
 #define EGL_NV_coverage_sample 1
-#define EGL_COVERAGE_BUFFERS_NV 0x20C5
-#define EGL_COVERAGE_SAMPLES_NV 0x20C6
+#define EGL_COVERAGE_BUFFERS_NV 0x30E0
+#define EGL_COVERAGE_SAMPLES_NV 0x30E1
 #endif
 
 /* EGL_NV_depth_nonlinear
  */
 #ifndef EGL_NV_depth_nonlinear
 #define EGL_NV_depth_nonlinear 1
-#define EGL_DEPTH_ENCODING_NV 0x20C3
+#define EGL_DEPTH_ENCODING_NV 0x30E2
 #define EGL_DEPTH_ENCODING_NONE_NV 0
-#define EGL_DEPTH_ENCODING_NONLINEAR_NV 0x20C4
+#define EGL_DEPTH_ENCODING_NONLINEAR_NV 0x30E3
 #endif
 
 #ifndef EGL_NV_nvva_image
@@ -215,24 +271,65 @@ EGLAPI EGLBoolean EGLAPIENTRY eglNvmaOutputSurfacePbufferUnlock(EGLDisplay displ
                                                             EGLSurface pbuffer);
 #endif
 
-/* EGL_NV_omx_sink -- currently undocumented.
-    This extension allows the OpenMAX videorenderer component to render to EGL
-    surfaces.*/
-#ifndef EGL_NV_omx_sink
-#define EGL_NV_omx_sink 1
-#define EGL_CONTEXT_OMX_VIDEORENDERER_COMPONENT_NV 0x3099 /* eglCreateContext attribute */
-#define EGL_OPENMAX_API 0x30A2 /* eglBindAPI target */
-#define EGL_OPENMAX_BIT 0x0008 /* EGL_RENDERABLE_TYPE mask bits */
+
+/* EGL_KHR_sync
+ */
+#ifndef EGL_KHR_sync
+#define EGL_KHR_sync 1
+typedef void* EGLSyncKHR;
+typedef void* NativeSyncKHR;
+typedef unsigned long long EGLTimeKHR;
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLSyncKHR eglCreateFenceSyncKHR( EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list ); 
+NativeSyncKHR eglCreateNativeSyncKHR( EGLSyncKHR sync );
+EGLBoolean eglDestroySyncKHR( EGLSyncKHR sync );
+EGLBoolean eglFenceKHR( EGLSyncKHR sync );
+EGLint eglClientWaitSyncKHR( EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout );
+EGLBoolean eglSignalSyncKHR( EGLSyncKHR sync, EGLenum mode );
+EGLBoolean eglGetSyncAttribKHR( EGLSyncKHR sync, EGLint attribute, EGLint *value );
+#else
+typedef EGLSyncKHR (EGLAPIENTRYP PFNEGLCREATEFENCESYNCKHRPROC)( EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list ); 
+typedef NativeSyncKHR (EGLAPIENTRYP PFNEGLCREATENATIVESYNCKHRPROC)( EGLSyncKHR sync );
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCKHRPROC)( EGLSyncKHR sync );
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLFENCEKHRPROC)( EGLSyncKHR sync );
+typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCKHRPROC)( EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout );
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC)( EGLSyncKHR sync, EGLenum mode );
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC)( EGLSyncKHR sync, EGLint attribute, EGLint *value );
+#endif
+
+/* !!!!! TODO: Get correct values for these defines !!!! 
+   Do not rely on these values...THEY WILL CHANGE!
+   And it WILL BREAK binary compatibility when they do! */
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR     0x3100
+#define EGL_SYNC_NATIVE_SYNC_KHR                 0x3101
+#define EGL_SYNC_STATUS_KHR                      0x3102
+#define EGL_SIGNALED_KHR                         0x3103
+#define EGL_UNSIGNALED_KHR                       0x3104
+#define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR          0x0001
+#define EGL_FOREVER_KHR                          0xFFFFFFFFFFFFFFFFull
+#define EGL_ALREADY_SIGNALED_KHR                 0x3105
+#define EGL_TIMEOUT_EXPIRED_KHR                  0x3106
+#define EGL_CONDITION_SATISFIED_KHR              0x3107
+#define EGL_SYNC_TYPE_KHR                        0x3108
+#define EGL_SYNC_CONDITION_KHR                   0x3109
+#define EGL_SYNC_FENCE_KHR                       0x310A
+#define EGL_NO_SYNC_KHR                          0x0000
 #endif
 
-/* EGL_NV_omx_image -- currently undocumented.
-    This extension allows an EGL image to be created with an openmax
-    videorenderer source. */
-#ifndef EGL_NV_omx_image
-#define EGL_NV_omx_image
-#define EGL_OPENMAX_COMPONENT_NV 0x30BF /* eglCreateImageKHR target */
+
+
+/* EGL_NV_omx_il_sink
+ */
+#ifndef EGL_NV_omx_il_sink
+#define EGL_NV_omx_il_sink
+#define EGL_OPENMAX_IL_BIT_NV  0x0010 /* EGL_RENDERABLE_TYPE bit */
+#define EGL_SURFACE_OMX_IL_EVENT_CALLBACK_NV 0x309A /* eglCreate*Surface attribute */
+#define EGL_SURFACE_OMX_IL_EMPTY_BUFFER_DONE_CALLBACK_NV 0x309B /* eglCreate*Surface attribute */
+#define EGL_SURFACE_OMX_IL_CALLBACK_DATA_NV 0x309C /* eglCreate*Surface attribute */
+#define EGL_SURFACE_COMPONENT_HANDLE_NV 0x309D /* eglQuerySurface attribute */
 #endif
 
+#define EGL_RMSURFACE_NV 0x30EF /* eglCreateImageKHR target */
 
 #ifdef __cplusplus
 }
diff --git a/make/stub_includes/egl/EGL/eglplatform.h b/make/stub_includes/egl/EGL/eglplatform.h
index 4a32edeef..69893006e 100755
--- a/make/stub_includes/egl/EGL/eglplatform.h
+++ b/make/stub_includes/egl/EGL/eglplatform.h
@@ -21,16 +21,21 @@
 ** replaced with corresponding types of the native window system in egl.h.
 **
 ** EGL and native handle values must match their types.
-**
-** This version of eglplatform.h is used to generate the glue code for the Java-side
-** EGL class, and is intended to be platform-independent.
-**
 */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if defined(_WIN32)
+    typedef signed   __int32 int32_t;
+    typedef unsigned __int32 uint32_t;
+    typedef signed   __int64 int64_t;
+    typedef unsigned __int64 uint64_t;
+#else
+    #include <stdint.h>
+#endif
+
 // Define storage class specifiers
 #ifndef APIENTRY
 #define APIENTRY
@@ -50,6 +55,15 @@ typedef int   EGLNativeDisplayType;
 typedef void* EGLNativeWindowType;
 typedef void* EGLNativePixmapType;
 
+// Define 64-bit integer extensions
+typedef int64_t  EGLint64NV;
+typedef uint64_t EGLuint64NV;
+
+// Define the pre-EGL 1.3 Native handle types for backwards compatibility
+typedef EGLNativeDisplayType NativeDisplayType;
+typedef EGLNativePixmapType  NativePixmapType;
+typedef EGLNativeWindowType  NativeWindowType;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/make/stub_includes/gluegen_egl/window-system-ext.c b/make/stub_includes/egl/window-system-ext.c
index e80b8aa41..7398847ac 100755
--- a/make/stub_includes/gluegen_egl/window-system-ext.c
+++ b/make/stub_includes/egl/window-system-ext.c
@@ -1,3 +1,5 @@
+#define USE_GLUEGEN
+
 // Define EGL_EGLEXT_PROTOTYPES so that the EGL extension prototypes in
 // "eglext.h" are parsed.
 #define EGL_EGLEXT_PROTOTYPES
diff --git a/make/stub_includes/gluegen_egl/window-system.c b/make/stub_includes/egl/window-system.c
index 13eef0d30..fbd0f0cde 100755
--- a/make/stub_includes/gluegen_egl/window-system.c
+++ b/make/stub_includes/egl/window-system.c
@@ -1 +1,2 @@
+#define USE_GLUEGEN
 #include <EGL/egl.h>
diff --git a/make/stub_includes/gluegen_egl/EGL/egl.h b/make/stub_includes/gluegen_egl/EGL/egl.h
deleted file mode 100755
index d9f6683ef..000000000
--- a/make/stub_includes/gluegen_egl/EGL/egl.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/* -*- mode: c; tab-width: 8; -*- */
-/* vi: set sw=4 ts=8: */
-/* Reference version of egl.h for EGL 1.3.
- * Last modified 2006/11/12
- */
-
-/* 
-* Copyright (c) 2007 The Khronos Group Inc. 
-* 
-* Permission is hereby granted, free of charge, to any person obtaining 
-* a copy of this software and associated documentation files (the 
-* "Software"), to deal in the Software without restriction, including 
-* without limitation the rights to use, copy, modify, merge, publish, 
-* distribute, sublicense, and/or sell copies of the Software, and to 
-* permit persons to whom the Software is furnished to do so, subject 
-* to the following conditions: 
-* The above copyright notice and this permission notice shall be included 
-* in all copies or substantial portions of the Software. 
-* 
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
-* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-* 
-*/ 
-
-/*
- * Copyright (c) 2007 NVIDIA Corporation.  All rights reserved.
- *
- * NVIDIA Corporation and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an express
- * license agreement from NVIDIA Corporation is strictly prohibited.
- */
-
-#ifndef __egl_h_
-#define __egl_h_
-
-/* All platform-dependent types and macro boilerplate (such as EGLAPI
- * and EGLAPIENTRY) should go in eglplatform.h.
- */
-#include <EGL/eglplatform.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* EGL Types */
-typedef int EGLint;
-typedef unsigned int EGLBoolean;
-typedef unsigned int EGLenum;
-/* GlueGen currently needs this form of typedef to produce distinct
-   types for each of these pointer types */
-typedef struct {} _EGLConfig, *EGLConfig;
-typedef struct {} _EGLContext, *EGLContext;
-typedef struct {} _EGLDisplay, *EGLDisplay;
-typedef struct {} _EGLSurface, *EGLSurface;
-typedef struct {} _EGLClientBuffer, *EGLClientBuffer;
-
-/* EGL Versioning */
-#define EGL_VERSION_1_0             1
-#define EGL_VERSION_1_1             1
-#define EGL_VERSION_1_2             1
-#define EGL_VERSION_1_3             1
-
-/* EGL Enumerants. Bitmasks and other exceptional cases aside, most
- * enums are assigned unique values starting at 0x3000.
- */
-
-/* EGL aliases */
-#define EGL_FALSE                   0
-#define EGL_TRUE                    1
-
-/* Out-of-band handle values */
-#define EGL_DEFAULT_DISPLAY         ((EGLNativeDisplayType)0)
-#define EGL_NO_CONTEXT              ((EGLContext)0)
-#define EGL_NO_DISPLAY              ((EGLDisplay)0)
-#define EGL_NO_SURFACE              ((EGLSurface)0)
-
-/* Out-of-band attribute value */
-#define EGL_DONT_CARE               ((EGLint)-1)
-
-/* Errors / GetError return values */
-#define EGL_SUCCESS                 0x3000
-#define EGL_NOT_INITIALIZED         0x3001
-#define EGL_BAD_ACCESS              0x3002
-#define EGL_BAD_ALLOC               0x3003
-#define EGL_BAD_ATTRIBUTE           0x3004
-#define EGL_BAD_CONFIG              0x3005
-#define EGL_BAD_CONTEXT             0x3006
-#define EGL_BAD_CURRENT_SURFACE     0x3007
-#define EGL_BAD_DISPLAY             0x3008
-#define EGL_BAD_MATCH               0x3009
-#define EGL_BAD_NATIVE_PIXMAP       0x300A
-#define EGL_BAD_NATIVE_WINDOW       0x300B
-#define EGL_BAD_PARAMETER           0x300C
-#define EGL_BAD_SURFACE             0x300D
-#define EGL_CONTEXT_LOST            0x300E    /* EGL 1.1 - IMG_power_management */
-
-/* Reserved 0x300F-0x301F for additional errors */
-
-/* Config attributes */
-#define EGL_BUFFER_SIZE             0x3020
-#define EGL_ALPHA_SIZE              0x3021
-#define EGL_BLUE_SIZE               0x3022
-#define EGL_GREEN_SIZE              0x3023
-#define EGL_RED_SIZE                0x3024
-#define EGL_DEPTH_SIZE              0x3025
-#define EGL_STENCIL_SIZE            0x3026
-#define EGL_CONFIG_CAVEAT           0x3027
-#define EGL_CONFIG_ID               0x3028
-#define EGL_LEVEL                   0x3029
-#define EGL_MAX_PBUFFER_HEIGHT      0x302A
-#define EGL_MAX_PBUFFER_PIXELS      0x302B
-#define EGL_MAX_PBUFFER_WIDTH       0x302C
-#define EGL_NATIVE_RENDERABLE       0x302D
-#define EGL_NATIVE_VISUAL_ID        0x302E
-#define EGL_NATIVE_VISUAL_TYPE      0x302F
-#define EGL_PRESERVED_RESOURCES     0x3030
-#define EGL_SAMPLES                 0x3031
-#define EGL_SAMPLE_BUFFERS          0x3032
-#define EGL_SURFACE_TYPE            0x3033
-#define EGL_TRANSPARENT_TYPE        0x3034
-#define EGL_TRANSPARENT_BLUE_VALUE  0x3035
-#define EGL_TRANSPARENT_GREEN_VALUE 0x3036
-#define EGL_TRANSPARENT_RED_VALUE   0x3037
-#define EGL_NONE                    0x3038    /* Attrib list terminator */
-#define EGL_BIND_TO_TEXTURE_RGB     0x3039
-#define EGL_BIND_TO_TEXTURE_RGBA    0x303A
-#define EGL_MIN_SWAP_INTERVAL       0x303B
-#define EGL_MAX_SWAP_INTERVAL       0x303C
-#define EGL_LUMINANCE_SIZE          0x303D
-#define EGL_ALPHA_MASK_SIZE         0x303E
-#define EGL_COLOR_BUFFER_TYPE       0x303F
-#define EGL_RENDERABLE_TYPE         0x3040
-#define EGL_MATCH_NATIVE_PIXMAP     0x3041    /* Pseudo-attribute (not queryable) */
-#define EGL_CONFORMANT              0x3042
-
-/* Reserved 0x3041-0x304F for additional config attributes */
-
-/* Config attribute values */
-#define EGL_SLOW_CONFIG             0x3050    /* EGL_CONFIG_CAVEAT value */
-#define EGL_NON_CONFORMANT_CONFIG   0x3051    /* EGL_CONFIG_CAVEAT value */
-#define EGL_TRANSPARENT_RGB         0x3052    /* EGL_TRANSPARENT_TYPE value */
-#define EGL_RGB_BUFFER              0x308E    /* EGL_COLOR_BUFFER_TYPE value */
-#define EGL_LUMINANCE_BUFFER        0x308F    /* EGL_COLOR_BUFFER_TYPE value */
-
-/* More config attribute values, for EGL_TEXTURE_FORMAT */
-#define EGL_NO_TEXTURE              0x305C
-#define EGL_TEXTURE_RGB             0x305D
-#define EGL_TEXTURE_RGBA            0x305E
-#define EGL_TEXTURE_2D              0x305F
-
-/* Config attribute mask bits */
-#define EGL_PBUFFER_BIT                 0x0001    /* EGL_SURFACE_TYPE mask bits */
-#define EGL_PIXMAP_BIT                  0x0002    /* EGL_SURFACE_TYPE mask bits */
-#define EGL_WINDOW_BIT                  0x0004    /* EGL_SURFACE_TYPE mask bits */
-#define EGL_VG_COLORSPACE_LINEAR_BIT    0x0020 /* EGL_SURFACE_TYPE mask bits */
-#define EGL_VG_ALPHA_FORMAT_PRE_BIT     0x0040 /* EGL_SURFACE_TYPE mask bits */
-
-#define EGL_OPENGL_ES_BIT               0x0001    /* EGL_RENDERABLE_TYPE mask bits */
-#define EGL_OPENVG_BIT                  0x0002    /* EGL_RENDERABLE_TYPE mask bits */
-#define EGL_OPENGL_ES2_BIT              0x0004    /* EGL_RENDERABLE_TYPE mask bits */
-
-/* QueryString targets */
-#define EGL_VENDOR                  0x3053
-#define EGL_VERSION                 0x3054
-#define EGL_EXTENSIONS              0x3055
-#define EGL_CLIENT_APIS             0x308D
-
-/* QuerySurface / CreatePbufferSurface targets */
-#define EGL_HEIGHT                  0x3056
-#define EGL_WIDTH                   0x3057
-#define EGL_LARGEST_PBUFFER         0x3058
-#define EGL_TEXTURE_FORMAT          0x3080
-#define EGL_TEXTURE_TARGET          0x3081
-#define EGL_MIPMAP_TEXTURE          0x3082
-#define EGL_MIPMAP_LEVEL            0x3083
-#define EGL_RENDER_BUFFER           0x3086
-#define EGL_VG_COLORSPACE           0x3087
-#define EGL_VG_ALPHA_FORMAT         0x3088
-#define EGL_HORIZONTAL_RESOLUTION   0x3090
-#define EGL_VERTICAL_RESOLUTION     0x3091
-#define EGL_PIXEL_ASPECT_RATIO      0x3092
-#define EGL_SWAP_BEHAVIOR           0x3093
-
-/* EGL_RENDER_BUFFER values / BindTexImage / ReleaseTexImage buffer targets */
-#define EGL_BACK_BUFFER             0x3084
-#define EGL_SINGLE_BUFFER           0x3085
-
-/* OpenVG color spaces */
-#define EGL_VG_COLORSPACE_sRGB      0x3089    /* EGL_VG_COLORSPACE value */
-#define EGL_VG_COLORSPACE_LINEAR    0x308A    /* EGL_VG_COLORSPACE value */
-
-/* OpenVG alpha formats */
-#define EGL_VG_ALPHA_FORMAT_NONPRE  0x308B    /* EGL_VG_ALPHA_FORMAT value */
-#define EGL_VG_ALPHA_FORMAT_PRE     0x308C    /* EGL_VG_ALPHA_FORMAT value */
-
-/* Constant scale factor by which fractional display resolutions &
- * aspect ratio are scaled when queried as integer values.
- */
-#define EGL_DISPLAY_SCALING         10000
-
-/* Unknown display resolution/aspect ratio */
-#define EGL_UNKNOWN                 ((EGLint)-1)
-
-/* Back buffer swap behaviors */
-#define EGL_BUFFER_PRESERVED        0x3094    /* EGL_SWAP_BEHAVIOR value */
-#define EGL_BUFFER_DESTROYED        0x3095    /* EGL_SWAP_BEHAVIOR value */
-
-/* CreatePbufferFromClientBuffer buffer types */
-#define EGL_OPENVG_IMAGE            0x3096
-
-/* QueryContext targets */
-#define EGL_CONTEXT_CLIENT_TYPE     0x3097
-
-/* CreateContext attributes */
-#define EGL_CONTEXT_CLIENT_VERSION  0x3098
-
-/* BindAPI/QueryAPI targets */
-#define EGL_OPENGL_ES_API           0x30A0
-#define EGL_OPENVG_API              0x30A1
-
-/* GetCurrentSurface targets */
-#define EGL_DRAW                    0x3059
-#define EGL_READ                    0x305A
-
-/* WaitNative engines */
-#define EGL_CORE_NATIVE_ENGINE      0x305B
-
-/* EGL 1.2 tokens renamed for consistency in EGL 1.3 */
-#define EGL_COLORSPACE              EGL_VG_COLORSPACE
-#define EGL_ALPHA_FORMAT            EGL_VG_ALPHA_FORMAT
-#define EGL_COLORSPACE_sRGB         EGL_VG_COLORSPACE_sRGB
-#define EGL_COLORSPACE_LINEAR       EGL_VG_COLORSPACE_LINEAR
-#define EGL_ALPHA_FORMAT_NONPRE     EGL_VG_ALPHA_FORMAT_NONPRE
-#define EGL_ALPHA_FORMAT_PRE        EGL_VG_ALPHA_FORMAT_PRE
-
-/* EGL extensions must request enum blocks from the Khronos
- * API Registrar, who maintains the enumerant registry. Submit
- * a bug in Khronos Bugzilla against task "Registry".
- */
-
-
-
-/* EGL Functions */
-
-EGLAPI EGLint EGLAPIENTRY eglGetError(void);
-
-EGLAPI EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id);
-EGLAPI EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor);
-EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy);
-
-EGLAPI const char * EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name);
-
-EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs,
-             EGLint config_size, EGLint *num_config);
-EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list,
-               EGLConfig *configs, EGLint config_size,
-               EGLint *num_config);
-EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config,
-                  EGLint attribute, EGLint *value);
-
-EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config,
-                  EGLNativeWindowType win,
-                  const EGLint *attrib_list);
-EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config,
-                   const EGLint *attrib_list);
-EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config,
-                  EGLNativePixmapType pixmap,
-                  const EGLint *attrib_list);
-EGLAPI EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface);
-EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface,
-               EGLint attribute, EGLint *value);
-
-EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api);
-EGLAPI EGLenum EGLAPIENTRY eglQueryAPI(void);
-
-EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient(void);
-
-EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread(void);
-
-EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(
-          EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer,
-          EGLConfig config, const EGLint *attrib_list);
-
-EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface,
-                EGLint attribute, EGLint value);
-EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
-EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
-
-
-EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval);
-
-
-EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config,
-                EGLContext share_context,
-                const EGLint *attrib_list);
-EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx);
-EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw,
-              EGLSurface read, EGLContext ctx);
-
-EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext(void);
-EGLAPI EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw);
-EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void);
-EGLAPI EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx,
-               EGLint attribute, EGLint *value);
-
-EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL(void);
-EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine);
-EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface);
-EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface,
-              EGLNativePixmapType target);
-
-typedef void (* EGLAPIENTRY __EGLFuncPtr)(void);
-EGLAPI __EGLFuncPtr eglGetProcAddress(const char *procname);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __egl_h_ */
diff --git a/make/stub_includes/gluegen_egl/EGL/eglext.h b/make/stub_includes/gluegen_egl/EGL/eglext.h
deleted file mode 100755
index c3f637754..000000000
--- a/make/stub_includes/gluegen_egl/EGL/eglext.h
+++ /dev/null
@@ -1,241 +0,0 @@
-#ifndef __eglext_h_
-#define __eglext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-/*
- * Copyright (c) 2007 NVIDIA Corporation.  All rights reserved.
- *
- * NVIDIA Corporation and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an express
- * license agreement from NVIDIA Corporation is strictly prohibited.
- */
-
-#include <EGL/egl.h>
-#include <EGL/eglplatform.h>
-
-/*************************************************************/
-
-/* Header file version number */
-/* eglext.h last updated 2007/11/20 */
-/* Current version at http://www.khronos.org/registry/egl/ */
-#define EGL_EGLEXT_VERSION 1
-
-#ifndef EGL_KHR_config_attribs
-#define EGL_KHR_config_attribs 1
-#define EGL_CONFORMANT_KHR                  0x3042	/* EGLConfig attribute */
-#define EGL_VG_COLORSPACE_LINEAR_BIT_KHR    0x0020	/* EGL_SURFACE_TYPE bitfield */
-#define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR		0x0040	/* EGL_SURFACE_TYPE bitfield */
-#endif
-
-#ifndef EGL_KHR_lock_surface
-#define EGL_KHR_lock_surface 1
-#define EGL_READ_SURFACE_BIT_KHR		0x0001	/* EGL_LOCK_USAGE_HINT_KHR bitfield */
-#define EGL_WRITE_SURFACE_BIT_KHR		0x0002	/* EGL_LOCK_USAGE_HINT_KHR bitfield */
-#define EGL_LOCK_SURFACE_BIT_KHR		0x0080	/* EGL_SURFACE_TYPE bitfield */
-#define EGL_OPTIMAL_FORMAT_BIT_KHR		0x0100	/* EGL_SURFACE_TYPE bitfield */
-#define EGL_MATCH_FORMAT_KHR			0x3043	/* EGLConfig attribute */
-#define EGL_FORMAT_RGB_565_EXACT_KHR		0x30C0	/* EGL_MATCH_FORMAT_KHR value */
-#define EGL_FORMAT_RGB_565_KHR			0x30C1	/* EGL_MATCH_FORMAT_KHR value */
-#define EGL_FORMAT_RGBA_8888_EXACT_KHR		0x30C2	/* EGL_MATCH_FORMAT_KHR value */
-#define EGL_FORMAT_RGBA_8888_KHR		0x30C3	/* EGL_MATCH_FORMAT_KHR value */
-#define EGL_MAP_PRESERVE_PIXELS_KHR		0x30C4	/* eglLockSurfaceKHR attribute */
-#define EGL_LOCK_USAGE_HINT_KHR			0x30C5	/* eglLockSurfaceKHR attribute */
-#define EGL_BITMAP_POINTER_KHR			0x30C6	/* eglQuerySurface attribute */
-#define EGL_BITMAP_PITCH_KHR			0x30C7	/* eglQuerySurface attribute */
-#define EGL_BITMAP_ORIGIN_KHR			0x30C8	/* eglQuerySurface attribute */
-#define EGL_BITMAP_PIXEL_RED_OFFSET_KHR		0x30C9	/* eglQuerySurface attribute */
-#define EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR	0x30CA	/* eglQuerySurface attribute */
-#define EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR	0x30CB	/* eglQuerySurface attribute */
-#define EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR	0x30CC	/* eglQuerySurface attribute */
-#define EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR	0x30CD	/* eglQuerySurface attribute */
-#define EGL_LOWER_LEFT_KHR			0x30CE	/* EGL_BITMAP_ORIGIN_KHR value */
-#define EGL_UPPER_LEFT_KHR			0x30CF	/* EGL_BITMAP_ORIGIN_KHR value */
-#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLBoolean EGLAPIENTRY eglLockSurfaceKHR (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);
-EGLAPI EGLBoolean EGLAPIENTRY eglUnlockSurfaceKHR (EGLDisplay display, EGLSurface surface);
-#endif /* EGL_EGLEXT_PROTOTYPES */
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface);
-#endif
-
-#ifndef EGL_KHR_image
-#define EGL_KHR_image 1
-#define EGL_NATIVE_PIXMAP_KHR			0x30B0	/* eglCreateImageKHR target */
-typedef void *EGLImageKHR;
-#define EGL_NO_IMAGE_KHR ((EGLImageKHR)0)
-#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, EGLint *attr_list);
-EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR (EGLDisplay dpy, EGLImageKHR image);
-#endif /* EGL_EGLEXT_PROTOTYPES */
-typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, EGLint *attr_list);
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGLImageKHR image);
-#endif
-
-#ifndef EGL_KHR_vg_parent_image
-#define EGL_KHR_vg_parent_image 1
-#define EGL_VG_PARENT_IMAGE_KHR			0x30BA	/* eglCreateImageKHR target */
-#endif
-
-#ifndef EGL_KHR_gl_texture_2D_image
-#define EGL_KHR_gl_texture_2D_image 1
-#define EGL_GL_TEXTURE_2D_KHR			0x30B1	/* eglCreateImageKHR target */
-#define EGL_GL_TEXTURE_LEVEL_KHR		0x30BC	/* eglCreateImageKHR attribute */
-#endif
-
-#ifndef EGL_KHR_gl_texture_cubemap_image
-#define EGL_KHR_gl_texture_cubemap_image 1
-#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR	0x30B3	/* eglCreateImageKHR target */
-#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR	0x30B4	/* eglCreateImageKHR target */
-#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR	0x30B5	/* eglCreateImageKHR target */
-#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR	0x30B6	/* eglCreateImageKHR target */
-#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR	0x30B7	/* eglCreateImageKHR target */
-#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR	0x30B8	/* eglCreateImageKHR target */
-#endif
-
-#ifndef EGL_KHR_gl_texture_3D_image
-#define EGL_KHR_gl_texture_3D_image 1
-#define EGL_GL_TEXTURE_3D_KHR			0x30B2	/* eglCreateImageKHR target */
-#define EGL_GL_TEXTURE_ZOFFSET_KHR		0x30BD	/* eglCreateImageKHR attribute */
-#endif
-
-#ifndef EGL_KHR_gl_renderbuffer_image
-#define EGL_KHR_gl_renderbuffer_image 1
-#define EGL_GL_RENDERBUFFER_KHR			0x30B9	/* eglCreateImageKHR target */
-#endif
-
-// Supported NV Extensions
-
-//  NOTE: EGL_KHR_bind_client_buffer == EGL_create_pbuffer_from_client_buffer
-/* EGL_KHR_bind_client_buffer */
-#ifndef EGL_KHR_bind_client_buffer
-#define EGL_create_pbuffer_from_client_buffer 1
-#define EGL_KHR_bind_client_buffer              1
-#define EGL_OPENVG_IMAGE_KHR                EGL_OPENVG_IMAGE
-#endif
-
-/* eglCreateImageKHR targets */
-/* eglCreateImageKHR target and eglCreatePbufferFromClientBuffer buftype */
-
-/* EGL_NV_perfmon */
-#ifndef EGL_NV_perfmon
-#define EGL_NV_perfmon 1
-#define EGL_PERFMONITOR_HARDWARE_COUNTERS_BIT_NV    0x00000001
-#define EGL_PERFMONITOR_OPENGL_ES_API_BIT_NV        0x00000010
-#define EGL_PERFMONITOR_OPENVG_API_BIT_NV           0x00000020
-#define EGL_PERFMONITOR_OPENGL_ES2_API_BIT_NV       0x00000040
-#define EGL_COUNTER_NAME_NV            0x1234
-#define EGL_COUNTER_DESCRIPTION_NV     0x1235
-#define EGL_IS_HARDWARE_COUNTER_NV     0x1236
-#define EGL_COUNTER_MAX_NV             0x1237
-#define EGL_COUNTER_VALUE_TYPE_NV      0x1238
-#define EGL_RAW_VALUE_NV               0x1239
-#define EGL_PERCENTAGE_VALUE_NV        0x1240
-#define EGL_BAD_CURRENT_PERFMONITOR_NV 0x1241
-#define EGL_NO_PERFMONITOR_NV ((EGLPerfMonitorNV)0)
-#define EGL_DEFAULT_PERFMARKER_NV ((EGLPerfMarkerNV)0)
-typedef void *EGLPerfMonitorNV;
-typedef void *EGLPerfCounterNV;
-typedef void *EGLPerfMarkerNV;
-#endif
-
-/* EGL_NV_texture_rectangle (reuse analagous WGL enum) */
-#ifndef EGL_NV_texture_rectangle
-#define EGL_NV_texture_rectangle 1
-#define EGL_GL_TEXTURE_RECTANGLE_NV_KHR           0x30BB
-#define EGL_TEXTURE_RECTANGLE_NV       0x20A2
-#endif
-
-#ifndef EGL_NV_system_time
-#define EGL_NV_system_time 1
-#endif
-
-/* EGL_NV_coverage_sample (reuse GLX_VIDEO_OUT_DEPTH_NV and
- * GLX_VIDEO_OUT_COLOR_AND_ALPHA_NV)
- */
-#ifndef EGL_NV_coverage_sample
-#define EGL_NV_coverage_sample 1
-#define EGL_COVERAGE_BUFFERS_NV 0x20C5
-#define EGL_COVERAGE_SAMPLES_NV 0x20C6
-#endif
-
-/* EGL_NV_depth_nonlinear
- */
-#ifndef EGL_NV_depth_nonlinear
-#define EGL_NV_depth_nonlinear 1
-#define EGL_DEPTH_ENCODING_NV 0x20C3
-#define EGL_DEPTH_ENCODING_NONE_NV 0
-#define EGL_DEPTH_ENCODING_NONLINEAR_NV 0x20C4
-#endif
-
-#ifndef EGL_NV_nvva_image
-#define EGL_NV_nvva_image 1
-#define EGL_NVVA_OUTPUT_SURFACE_NV                0x30BE
-EGLAPI EGLBoolean EGLAPIENTRY eglVideoImageLockNV(EGLDisplay dpy, EGLImageKHR image, EGLenum api);
-EGLAPI EGLBoolean EGLAPIENTRY eglVideoImageUnlockNV(EGLDisplay dpy, EGLImageKHR image);
-#endif
-
-#ifndef EGL_NV_nvma_image
-#define EGL_NV_nvma_image 1
-#define EGL_NVMA_OUTPUT_SURFACE_NV                0x30BE /* eglCreateImageKHR target and eglCreatePbufferFromClientBuffer buftype */
-#endif
-
-#ifndef EGL_NV_client_api_nvma
-#define EGL_NV_client_api_nvma 1
-EGLAPI EGLBoolean EGLAPIENTRY eglNvmaOutputSurfacePbufferLock(EGLDisplay display,
-                                                          EGLSurface pbuffer);
-EGLAPI EGLBoolean EGLAPIENTRY eglNvmaOutputSurfacePbufferUnlock(EGLDisplay display,
-                                                            EGLSurface pbuffer);
-#endif
-
-/* EGL_NV_omx_sink -- currently undocumented.
-    This extension allows the OpenMAX videorenderer component to render to EGL
-    surfaces.*/
-#ifndef EGL_NV_omx_sink
-#define EGL_NV_omx_sink 1
-#define EGL_CONTEXT_OMX_VIDEORENDERER_COMPONENT_NV 0x3099 /* eglCreateContext attribute */
-#define EGL_OPENMAX_API 0x30A2 /* eglBindAPI target */
-#define EGL_OPENMAX_BIT 0x0008 /* EGL_RENDERABLE_TYPE mask bits */
-#endif
-
-/* EGL_NV_omx_image -- currently undocumented.
-    This extension allows an EGL image to be created with an openmax
-    videorenderer source. */
-#ifndef EGL_NV_omx_image
-#define EGL_NV_omx_image
-#define EGL_OPENMAX_COMPONENT_NV 0x30BF /* eglCreateImageKHR target */
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/make/stub_includes/gluegen_egl/EGL/eglplatform.h b/make/stub_includes/gluegen_egl/EGL/eglplatform.h
deleted file mode 100755
index 28dba6bee..000000000
--- a/make/stub_includes/gluegen_egl/EGL/eglplatform.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2007 NVIDIA Corporation.  All rights reserved.
- *
- * NVIDIA Corporation and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an express
- * license agreement from NVIDIA Corporation is strictly prohibited.
- */
-
-#ifndef EGLPLATFORM_H
-#define EGLPLATFORM_H
-
-/*
-** eglplatform.h is platform dependent. It defines:
-**
-**     - Native types
-**     - EGL and native handle values
-**
-** EGLNativeDisplayType, EGLNativeWindowType and EGLNativePixmapType are to be
-** replaced with corresponding types of the native window system in egl.h.
-**
-** EGL and native handle values must match their types.
-**
-** This version of eglplatform.h is used to generate the glue code for the Java-side
-** EGL class, and is intended to be platform-independent.
-**
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Define storage class specifiers
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-
-#ifndef EGLAPIENTRY
-#define EGLAPIENTRY 
-#endif
-#ifndef EGLAPIENTRYP
-#define EGLAPIENTRYP EGLAPIENTRY *
-#endif
-
-#define EGLAPI
-
-// Define native window system types
-typedef struct {} _EGLNativeDisplayType;
-typedef struct {} _EGLNativeWindowType;
-typedef struct {} _EGLNativePixmapType;
-typedef _EGLNativeDisplayType* EGLNativeDisplayType;
-typedef _EGLNativeWindowType* EGLNativeWindowType;
-typedef _EGLNativePixmapType* EGLNativePixmapType;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* EGLPLATFORM_H */