Add fix for glext.h - should compile with khrplatform.h included now.
Merge branch 'master' into 184-xml-fixes
diff --git a/api/GL/glcorearb.h b/api/GL/glcorearb.h
index a2fc713..33b01e2 100755
--- a/api/GL/glcorearb.h
+++ b/api/GL/glcorearb.h
@@ -79,14 +79,15 @@
#define GL_VERSION_1_0 1
typedef void GLvoid;
typedef unsigned int GLenum;
-typedef float GLfloat;
+#include <KHR/khrplatform.h>
+typedef khronos_float_t GLfloat;
typedef int GLint;
typedef int GLsizei;
typedef unsigned int GLbitfield;
typedef double GLdouble;
typedef unsigned int GLuint;
typedef unsigned char GLboolean;
-typedef unsigned char GLubyte;
+typedef khronos_uint8_t GLubyte;
#define GL_DEPTH_BUFFER_BIT 0x00000100
#define GL_STENCIL_BUFFER_BIT 0x00000400
#define GL_COLOR_BUFFER_BIT 0x00004000
@@ -362,7 +363,7 @@
#ifndef GL_VERSION_1_1
#define GL_VERSION_1_1 1
-typedef float GLclampf;
+typedef khronos_float_t GLclampf;
typedef double GLclampd;
#define GL_COLOR_LOGIC_OP 0x0BF2
#define GL_POLYGON_OFFSET_UNITS 0x2A00
@@ -613,7 +614,6 @@
#ifndef GL_VERSION_1_5
#define GL_VERSION_1_5 1
-#include <KHR/khrplatform.h>
typedef khronos_ssize_t GLsizeiptr;
typedef khronos_intptr_t GLintptr;
#define GL_BUFFER_SIZE 0x8764
@@ -689,9 +689,9 @@
#ifndef GL_VERSION_2_0
#define GL_VERSION_2_0 1
typedef char GLchar;
-typedef short GLshort;
-typedef signed char GLbyte;
-typedef unsigned short GLushort;
+typedef khronos_int16_t GLshort;
+typedef khronos_int8_t GLbyte;
+typedef khronos_uint16_t GLushort;
#define GL_BLEND_EQUATION_RGB 0x8009
#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
@@ -998,7 +998,7 @@
#ifndef GL_VERSION_3_0
#define GL_VERSION_3_0 1
-typedef unsigned short GLhalf;
+typedef khronos_uint16_t GLhalf;
#define GL_COMPARE_REF_TO_TEXTURE 0x884E
#define GL_CLIP_DISTANCE0 0x3000
#define GL_CLIP_DISTANCE1 0x3001
@@ -1496,45 +1496,8 @@
#ifndef GL_VERSION_3_2
#define GL_VERSION_3_2 1
typedef struct __GLsync *GLsync;
-#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glxext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GL_EXT_timer_query extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__) || defined(__digital__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__) || defined(_LP64)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS ) || defined(__sgi)
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-/* Fallback if nothing above works */
-#include <inttypes.h>
-#endif
-#endif
-typedef uint64_t GLuint64;
-typedef int64_t GLint64;
+typedef khronos_uint64_t GLuint64;
+typedef khronos_int64_t GLint64;
#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001
#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
#define GL_LINES_ADJACENCY 0x000A
@@ -2964,7 +2927,7 @@
#ifndef GL_ARB_bindless_texture
#define GL_ARB_bindless_texture 1
-typedef uint64_t GLuint64EXT;
+typedef khronos_uint64_t GLuint64EXT;
#define GL_UNSIGNED_INT64_ARB 0x140F
typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLEARBPROC) (GLuint texture);
typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLEARBPROC) (GLuint texture, GLuint sampler);
@@ -5091,7 +5054,7 @@
#ifndef GL_NV_gpu_shader5
#define GL_NV_gpu_shader5 1
-typedef int64_t GLint64EXT;
+typedef khronos_int64_t GLint64EXT;
#define GL_INT64_NV 0x140E
#define GL_UNSIGNED_INT64_NV 0x140F
#define GL_INT8_NV 0x8FE0
diff --git a/api/GL/glext.h b/api/GL/glext.h
index 31a9543..c452a05 100644
--- a/api/GL/glext.h
+++ b/api/GL/glext.h
@@ -53,6 +53,8 @@
#define GL_GLEXT_VERSION 20181031
+#include <KHR/khrplatform.h>
+
/* Generated C header for:
* API: gl
* Profile: compatibility
@@ -464,7 +466,6 @@
#ifndef GL_VERSION_1_5
#define GL_VERSION_1_5 1
-#include <KHR/khrplatform.h>
typedef khronos_ssize_t GLsizeiptr;
typedef khronos_intptr_t GLintptr;
#define GL_BUFFER_SIZE 0x8764
@@ -879,7 +880,7 @@
#ifndef GL_VERSION_3_0
#define GL_VERSION_3_0 1
-typedef unsigned short GLhalf;
+typedef khronos_uint16_t GLhalf;
#define GL_COMPARE_REF_TO_TEXTURE 0x884E
#define GL_CLIP_DISTANCE0 0x3000
#define GL_CLIP_DISTANCE1 0x3001
@@ -1383,45 +1384,8 @@
#ifndef GL_VERSION_3_2
#define GL_VERSION_3_2 1
typedef struct __GLsync *GLsync;
-#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glxext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GL_EXT_timer_query extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__) || defined(__digital__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__) || defined(_LP64)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS ) || defined(__sgi)
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-/* Fallback if nothing above works */
-#include <inttypes.h>
-#endif
-#endif
-typedef uint64_t GLuint64;
-typedef int64_t GLint64;
+typedef khronos_uint64_t GLuint64;
+typedef khronos_int64_t GLint64;
#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001
#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
#define GL_LINES_ADJACENCY 0x000A
@@ -2936,7 +2900,7 @@
#ifndef GL_ARB_bindless_texture
#define GL_ARB_bindless_texture 1
-typedef uint64_t GLuint64EXT;
+typedef khronos_uint64_t GLuint64EXT;
#define GL_UNSIGNED_INT64_ARB 0x140F
typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLEARBPROC) (GLuint texture);
typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLEARBPROC) (GLuint texture, GLuint sampler);
@@ -3496,7 +3460,7 @@
#ifndef GL_ARB_half_float_pixel
#define GL_ARB_half_float_pixel 1
-typedef unsigned short GLhalfARB;
+typedef khronos_uint16_t GLhalfARB;
#define GL_HALF_FLOAT_ARB 0x140B
#endif /* GL_ARB_half_float_pixel */
@@ -4732,9 +4696,8 @@
#ifndef GL_ARB_vertex_buffer_object
#define GL_ARB_vertex_buffer_object 1
-#include <stddef.h>
-typedef ptrdiff_t GLsizeiptrARB;
-typedef ptrdiff_t GLintptrARB;
+typedef khronos_ssize_t GLsizeiptrARB;
+typedef khronos_intptr_t GLintptrARB;
#define GL_BUFFER_SIZE_ARB 0x8764
#define GL_BUFFER_USAGE_ARB 0x8765
#define GL_ARRAY_BUFFER_ARB 0x8892
@@ -5135,7 +5098,7 @@
#ifndef GL_OES_fixed_point
#define GL_OES_fixed_point 1
-typedef GLint GLfixed;
+typedef khronos_int32_t GLfixed;
#define GL_FIXED_OES 0x140C
typedef void (APIENTRYP PFNGLALPHAFUNCXOESPROC) (GLenum func, GLfixed ref);
typedef void (APIENTRYP PFNGLCLEARCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
@@ -5521,7 +5484,7 @@
#ifndef GL_AMD_gpu_shader_int64
#define GL_AMD_gpu_shader_int64 1
-typedef int64_t GLint64EXT;
+typedef khronos_int64_t GLint64EXT;
#define GL_INT64_NV 0x140E
#define GL_UNSIGNED_INT64_NV 0x140F
#define GL_INT8_NV 0x8FE0
diff --git a/api/GL/glxext.h b/api/GL/glxext.h
index 12da554..966409b 100755
--- a/api/GL/glxext.h
+++ b/api/GL/glxext.h
@@ -34,7 +34,7 @@
** https://github.com/KhronosGroup/OpenGL-Registry
*/
-#define GLX_GLXEXT_VERSION 20181017
+#define GLX_GLXEXT_VERSION 20181031
/* Generated C header for:
* API: glx
diff --git a/api/GL/wgl.h b/api/GL/wgl.h
index 8f5c059..3d0c92b 100644
--- a/api/GL/wgl.h
+++ b/api/GL/wgl.h
@@ -39,7 +39,7 @@
#include <windows.h>
#endif
-/* Generated on date 20181017 */
+/* Generated on date 20181031 */
/* Generated C header for:
* API: wgl
diff --git a/api/GL/wglext.h b/api/GL/wglext.h
index 0785c32..48e4de2 100755
--- a/api/GL/wglext.h
+++ b/api/GL/wglext.h
@@ -39,7 +39,7 @@
#include <windows.h>
#endif
-#define WGL_WGLEXT_VERSION 20181017
+#define WGL_WGLEXT_VERSION 20181031
/* Generated C header for:
* API: wgl
diff --git a/api/GLES/gl.h b/api/GLES/gl.h
index d80ea4a..e3303b6 100644
--- a/api/GLES/gl.h
+++ b/api/GLES/gl.h
@@ -36,7 +36,7 @@
#include <GLES/glplatform.h>
-/* Generated on date 20181017 */
+/* Generated on date 20181031 */
/* Generated C header for:
* API: gles1
@@ -53,8 +53,8 @@
#include <KHR/khrplatform.h>
typedef khronos_int8_t GLbyte;
typedef khronos_float_t GLclampf;
-typedef short GLshort;
-typedef unsigned short GLushort;
+typedef khronos_int16_t GLshort;
+typedef khronos_uint16_t GLushort;
typedef void GLvoid;
typedef unsigned int GLenum;
typedef khronos_float_t GLfloat;
diff --git a/api/GLES/glext.h b/api/GLES/glext.h
index da8d199..040bba6 100644
--- a/api/GLES/glext.h
+++ b/api/GLES/glext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20181017 */
+/* Generated on date 20181031 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES2/gl2.h b/api/GLES2/gl2.h
index c539a92..996fcd5 100644
--- a/api/GLES2/gl2.h
+++ b/api/GLES2/gl2.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20181017 */
+/* Generated on date 20181031 */
/* Generated C header for:
* API: gles2
@@ -62,8 +62,8 @@
typedef khronos_int8_t GLbyte;
typedef khronos_float_t GLclampf;
typedef khronos_int32_t GLfixed;
-typedef short GLshort;
-typedef unsigned short GLushort;
+typedef khronos_int16_t GLshort;
+typedef khronos_uint16_t GLushort;
typedef void GLvoid;
typedef struct __GLsync *GLsync;
typedef khronos_int64_t GLint64;
diff --git a/api/GLES2/gl2ext.h b/api/GLES2/gl2ext.h
index 21770b9..ab1ddb8 100644
--- a/api/GLES2/gl2ext.h
+++ b/api/GLES2/gl2ext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20181017 */
+/* Generated on date 20181031 */
/* Generated C header for:
* API: gles2
@@ -3490,6 +3490,10 @@
#endif
#endif /* GL_OVR_multiview_multisampled_render_to_texture */
+#ifndef GL_QCOM_YUV_texture_gather
+#define GL_QCOM_YUV_texture_gather 1
+#endif /* GL_QCOM_YUV_texture_gather */
+
#ifndef GL_QCOM_alpha_test
#define GL_QCOM_alpha_test 1
#define GL_ALPHA_TEST_QCOM 0x0BC0
diff --git a/api/GLES3/gl3.h b/api/GLES3/gl3.h
index 0fdbe79..6b3f320 100644
--- a/api/GLES3/gl3.h
+++ b/api/GLES3/gl3.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20181017 */
+/* Generated on date 20181031 */
/* Generated C header for:
* API: gles2
@@ -62,8 +62,8 @@
typedef khronos_int8_t GLbyte;
typedef khronos_float_t GLclampf;
typedef khronos_int32_t GLfixed;
-typedef short GLshort;
-typedef unsigned short GLushort;
+typedef khronos_int16_t GLshort;
+typedef khronos_uint16_t GLushort;
typedef void GLvoid;
typedef struct __GLsync *GLsync;
typedef khronos_int64_t GLint64;
@@ -670,7 +670,7 @@
#ifndef GL_ES_VERSION_3_0
#define GL_ES_VERSION_3_0 1
-typedef unsigned short GLhalf;
+typedef khronos_uint16_t GLhalf;
#define GL_READ_BUFFER 0x0C02
#define GL_UNPACK_ROW_LENGTH 0x0CF2
#define GL_UNPACK_SKIP_ROWS 0x0CF3
diff --git a/xml/genheaders.py b/xml/genheaders.py
index 6cb0634..269363a 100755
--- a/xml/genheaders.py
+++ b/xml/genheaders.py
@@ -257,6 +257,12 @@
format('#define GLX_GLXEXT_VERSION %s' % time.strftime('%Y%m%d')),
''
]
+# This is a bad but functional workaround for a structural problem in the scripts
+# identified in https://github.com/KhronosGroup/OpenGL-Registry/pull/186#issuecomment-416196246
+glextKHRplatformStrings = [
+ '#include <KHR/khrplatform.h>',
+ ''
+]
# EGL_EGLEXT_VERSION is defined only in eglext.h
eglextVersionStrings = [
format('#define EGL_EGLEXT_VERSION %s' % time.strftime('%Y%m%d')),
@@ -279,7 +285,7 @@
defaultExtensions = 'gl', # Default extensions for GL
addExtensions = None,
removeExtensions = None,
- prefixText = prefixStrings + glExtPlatformStrings + glextVersionStrings,
+ prefixText = prefixStrings + glExtPlatformStrings + glextVersionStrings + glextKHRplatformStrings,
genFuncPointers = True,
protectFile = protectFile,
protectFeature = protectFeature,
diff --git a/xml/gl.xml b/xml/gl.xml
index 324b117..e413fb0 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -27,60 +27,22 @@
<!-- SECTION: GL type definitions. -->
<types>
<!-- These are dependencies GL types require to be declared legally -->
- <type name="stddef">#include <stddef.h></type>
<type name="khrplatform">#include <KHR/khrplatform.h></type>
- <type name="inttypes">#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glxext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GL_EXT_timer_query extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__) || defined(__digital__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__) || defined(_LP64)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS ) || defined(__sgi)
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-/* Fallback if nothing above works */
-#include <inttypes.h>
-#endif
-#endif</type>
<!-- These are actual GL types -->
<type>typedef unsigned int <name>GLenum</name>;</type>
<type>typedef unsigned char <name>GLboolean</name>;</type>
<type>typedef unsigned int <name>GLbitfield</name>;</type>
<type comment="Not an actual GL type, though used in headers in the past">typedef void <name>GLvoid</name>;</type>
- <type>typedef signed char <name>GLbyte</name>;</type>
- <type>typedef short <name>GLshort</name>;</type>
+ <type requires="khrplatform">typedef khronos_int8_t <name>GLbyte</name>;</type>
+ <type requires="khrplatform">typedef khronos_uint8_t <name>GLubyte</name>;</type>
+ <type requires="khrplatform">typedef khronos_int16_t <name>GLshort</name>;</type>
+ <type requires="khrplatform">typedef khronos_uint16_t <name>GLushort</name>;</type>
<type>typedef int <name>GLint</name>;</type>
- <type>typedef int <name>GLclampx</name>;</type>
- <type>typedef unsigned char <name>GLubyte</name>;</type>
- <type>typedef unsigned short <name>GLushort</name>;</type>
<type>typedef unsigned int <name>GLuint</name>;</type>
+ <type requires="khrplatform">typedef khronos_int32_t <name>GLclampx</name>;</type>
<type>typedef int <name>GLsizei</name>;</type>
- <type>typedef float <name>GLfloat</name>;</type>
- <type>typedef float <name>GLclampf</name>;</type>
+ <type requires="khrplatform">typedef khronos_float_t <name>GLfloat</name>;</type>
+ <type requires="khrplatform">typedef khronos_float_t <name>GLclampf</name>;</type>
<type>typedef double <name>GLdouble</name>;</type>
<type>typedef double <name>GLclampd</name>;</type>
<type>typedef void *<name>GLeglClientBufferEXT</name>;</type>
@@ -92,53 +54,24 @@
#else
typedef unsigned int GLhandleARB;
#endif</type>
- <type>typedef unsigned short <name>GLhalfARB</name>;</type>
- <type>typedef unsigned short <name>GLhalf</name>;</type>
- <type comment="Must be 32 bits">typedef GLint <name>GLfixed</name>;</type>
+ <type requires="khrplatform">typedef khronos_uint16_t <name>GLhalf</name>;</type>
+ <type requires="khrplatform">typedef khronos_uint16_t <name>GLhalfARB</name>;</type>
+ <type requires="khrplatform">typedef khronos_int32_t <name>GLfixed</name>;</type>
<type requires="khrplatform">typedef khronos_intptr_t <name>GLintptr</name>;</type>
+ <type requires="khrplatform">typedef khronos_intptr_t <name>GLintptrARB</name>;</type>
<type requires="khrplatform">typedef khronos_ssize_t <name>GLsizeiptr</name>;</type>
- <type requires="inttypes">typedef int64_t <name>GLint64</name>;</type>
- <type requires="inttypes">typedef uint64_t <name>GLuint64</name>;</type>
- <type requires="stddef">typedef ptrdiff_t <name>GLintptrARB</name>;</type>
- <type requires="stddef">typedef ptrdiff_t <name>GLsizeiptrARB</name>;</type>
- <type requires="inttypes">typedef int64_t <name>GLint64EXT</name>;</type>
- <type requires="inttypes">typedef uint64_t <name>GLuint64EXT</name>;</type>
+ <type requires="khrplatform">typedef khronos_ssize_t <name>GLsizeiptrARB</name>;</type>
+ <type requires="khrplatform">typedef khronos_int64_t <name>GLint64</name>;</type>
+ <type requires="khrplatform">typedef khronos_int64_t <name>GLint64EXT</name>;</type>
+ <type requires="khrplatform">typedef khronos_uint64_t <name>GLuint64</name>;</type>
+ <type requires="khrplatform">typedef khronos_uint64_t <name>GLuint64EXT</name>;</type>
<type>typedef struct __GLsync *<name>GLsync</name>;</type>
<type comment="compatible with OpenCL cl_context"><name>struct _cl_context</name>;</type>
<type comment="compatible with OpenCL cl_event"><name>struct _cl_event</name>;</type>
<type>typedef void (<apientry/> *<name>GLDEBUGPROC</name>)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);</type>
<type>typedef void (<apientry/> *<name>GLDEBUGPROCARB</name>)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);</type>
<type>typedef void (<apientry/> *<name>GLDEBUGPROCKHR</name>)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);</type>
- <!-- GLES 1 types -->
- <type api="gles1" requires="khrplatform">typedef khronos_int32_t <name>GLclampx</name>;</type>
- <!-- GLES 1/2 types (tagged for GLES 1) -->
- <type api="gles1" requires="khrplatform">typedef khronos_int8_t <name>GLbyte</name>;</type>
- <type api="gles1" requires="khrplatform">typedef khronos_uint8_t <name>GLubyte</name>;</type>
- <type api="gles1" requires="khrplatform">typedef khronos_float_t <name>GLfloat</name>;</type>
- <type api="gles1" requires="khrplatform">typedef khronos_float_t <name>GLclampf</name>;</type>
- <type api="gles1" requires="khrplatform">typedef khronos_int32_t <name>GLfixed</name>;</type>
- <type api="gles1" requires="khrplatform">typedef khronos_int64_t <name>GLint64</name>;</type>
- <type api="gles1" requires="khrplatform">typedef khronos_uint64_t <name>GLuint64</name>;</type>
- <type api="gles1" requires="khrplatform">typedef khronos_intptr_t <name>GLintptr</name>;</type>
- <type api="gles1" requires="khrplatform">typedef khronos_ssize_t <name>GLsizeiptr</name>;</type>
- <!-- GLES 1/2 types (tagged for GLES 2 - attribute syntax is limited) -->
- <type api="gles2" requires="khrplatform">typedef khronos_int8_t <name>GLbyte</name>;</type>
- <type api="gles2" requires="khrplatform">typedef khronos_uint8_t <name>GLubyte</name>;</type>
- <type api="gles2" requires="khrplatform">typedef khronos_float_t <name>GLfloat</name>;</type>
- <type api="gles2" requires="khrplatform">typedef khronos_float_t <name>GLclampf</name>;</type>
- <type api="gles2" requires="khrplatform">typedef khronos_int32_t <name>GLfixed</name>;</type>
- <type api="gles2" requires="khrplatform">typedef khronos_int64_t <name>GLint64</name>;</type>
- <type api="gles2" requires="khrplatform">typedef khronos_uint64_t <name>GLuint64</name>;</type>
- <type api="gles2" requires="khrplatform">typedef khronos_int64_t <name>GLint64EXT</name>;</type>
- <type api="gles2" requires="khrplatform">typedef khronos_uint64_t <name>GLuint64EXT</name>;</type>
- <type api="gles2" requires="khrplatform">typedef khronos_intptr_t <name>GLintptr</name>;</type>
- <type api="gles2" requires="khrplatform">typedef khronos_ssize_t <name>GLsizeiptr</name>;</type>
- <!-- GLES 2 types (none currently) -->
- <!-- GLSC 2 types -->
- <type api="glsc2" requires="khrplatform">typedef khronos_uint8_t <name>GLubyte</name>;</type>
- <type api="glsc2" requires="khrplatform">typedef khronos_float_t <name>GLfloat</name>;</type>
- <type api="glsc2" requires="khrplatform">typedef khronos_intptr_t <name>GLintptr</name>;</type>
- <type api="glsc2" requires="khrplatform">typedef khronos_ssize_t <name>GLsizeiptr</name>;</type>
+
<!-- Vendor extension types -->
<type>typedef void (<apientry/> *<name>GLDEBUGPROCAMD</name>)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam);</type>
<type>typedef unsigned short <name>GLhalfNV</name>;</type>
diff --git a/xml/testesext.c b/xml/testesext.c
index 2544c7b..8f1f236 100644
--- a/xml/testesext.c
+++ b/xml/testesext.c
@@ -1,4 +1,4 @@
-/*% cc -I. -I.. -I../../../../../registry/trunk/egl/api/ -c % ; rm testext.o
+/*% cc -I. -I../api -I../../../../../registry/trunk/egl/api/ -c % ; rm testesext.o
*
* Test to make sure gl3.h builds properly.
* Will also use SVN internal versions of gl3platform.h
