]> git.cworth.org Git - apitrace/blobdiff - specs/eglapi.py
Use the correct terminator EGL_NONE for eglChooseConfig attrib_list.
[apitrace] / specs / eglapi.py
index 1813145f0bb60b18255b5792b91e61ff5a2796c7..0a56d3406ac1ed9cc1c136876f8f7e7af9255623 100644 (file)
@@ -27,6 +27,8 @@
 
 
 from stdapi import *
+from gltypes import *
+from eglenum import *
 
 EGLNativeDisplayType = Opaque("EGLNativeDisplayType")
 EGLNativeWindowType = Opaque("EGLNativeWindowType")
@@ -39,332 +41,235 @@ EGLSurface = Opaque("EGLSurface")
 
 EGLClientBuffer = Opaque("EGLClientBuffer")
 
-_EGLBoolean = Alias("EGLBoolean", UInt)
-EGLBoolean = FakeEnum(_EGLBoolean, [
+EGLBoolean = Enum("EGLBoolean", [
     "EGL_FALSE",
     "EGL_TRUE",
 ])
 
 EGLint = Alias("EGLint", Int32)
-EGLenum = Alias("EGLenum", UInt)
-
-EGLError = FakeEnum(EGLint, [
-    "EGL_SUCCESS",                  # 0x3000
-    "EGL_NOT_INITIALIZED",          # 0x3001
-    "EGL_BAD_ACCESS",               # 0x3002
-    "EGL_BAD_ALLOC",                # 0x3003
-    "EGL_BAD_ATTRIBUTE",            # 0x3004
-    "EGL_BAD_CONFIG",               # 0x3005
-    "EGL_BAD_CONTEXT",              # 0x3006
-    "EGL_BAD_CURRENT_SURFACE",      # 0x3007
-    "EGL_BAD_DISPLAY",              # 0x3008
-    "EGL_BAD_MATCH",                # 0x3009
-    "EGL_BAD_NATIVE_PIXMAP",        # 0x300A
-    "EGL_BAD_NATIVE_WINDOW",        # 0x300B
-    "EGL_BAD_PARAMETER",            # 0x300C
-    "EGL_BAD_SURFACE",              # 0x300D
-    "EGL_CONTEXT_LOST",             # 0x300E  /* EGL 1.1 - IMG_power_management */
-])
-
-EGLConfigAttrib = FakeEnum(EGLint, [
-    "EGL_BUFFER_SIZE",              # 0x3020
-    "EGL_ALPHA_SIZE",               # 0x3021
-    "EGL_BLUE_SIZE",                # 0x3022
-    "EGL_GREEN_SIZE",               # 0x3023
-    "EGL_RED_SIZE",                 # 0x3024
-    "EGL_DEPTH_SIZE",               # 0x3025
-    "EGL_STENCIL_SIZE",             # 0x3026
-    "EGL_CONFIG_CAVEAT",            # 0x3027
-    "EGL_CONFIG_ID",                # 0x3028
-    "EGL_LEVEL",                    # 0x3029
-    "EGL_MAX_PBUFFER_HEIGHT",       # 0x302A
-    "EGL_MAX_PBUFFER_PIXELS",       # 0x302B
-    "EGL_MAX_PBUFFER_WIDTH",        # 0x302C
-    "EGL_NATIVE_RENDERABLE",        # 0x302D
-    "EGL_NATIVE_VISUAL_ID",         # 0x302E
-    "EGL_NATIVE_VISUAL_TYPE",       # 0x302F
-    "EGL_SAMPLES",                  # 0x3031
-    "EGL_SAMPLE_BUFFERS",           # 0x3032
-    "EGL_SURFACE_TYPE",             # 0x3033
-    "EGL_TRANSPARENT_TYPE",         # 0x3034
-    "EGL_TRANSPARENT_BLUE_VALUE",   # 0x3035
-    "EGL_TRANSPARENT_GREEN_VALUE",  # 0x3036
-    "EGL_TRANSPARENT_RED_VALUE",    # 0x3037
-    "EGL_NONE",                     # 0x3038  /* Attrib list terminator */
-    "EGL_BIND_TO_TEXTURE_RGB",      # 0x3039
-    "EGL_BIND_TO_TEXTURE_RGBA",     # 0x303A
-    "EGL_MIN_SWAP_INTERVAL",        # 0x303B
-    "EGL_MAX_SWAP_INTERVAL",        # 0x303C
-    "EGL_LUMINANCE_SIZE",           # 0x303D
-    "EGL_ALPHA_MASK_SIZE",          # 0x303E
-    "EGL_COLOR_BUFFER_TYPE",        # 0x303F
-    "EGL_RENDERABLE_TYPE",          # 0x3040
-    "EGL_MATCH_NATIVE_PIXMAP",      # 0x3041  /* Pseudo-attribute (not queryable) */
-    "EGL_CONFORMANT",               # 0x3042
-
-    # EGL_KHR_lock_surface
-    "EGL_MATCH_FORMAT_KHR",         # 0x3043
-
-    # EGL_NV_coverage_sample
-    "EGL_COVERAGE_BUFFERS_NV",      # 0x30E0
-    "EGL_COVERAGE_SAMPLES_NV",      # 0x30E1
-
-    # EGL_NV_depth_nonlinear
-    "EGL_DEPTH_ENCODING_NV",        # 0x30E2
-
-    # EGL_HI_colorformats
-    "EGL_COLOR_FORMAT_HI",          # 0x8F70
-])
-
-EGLName = FakeEnum(EGLint, [
-    "EGL_VENDOR",                   # 0x3053
-    "EGL_VERSION",                  # 0x3054
-    "EGL_EXTENSIONS",               # 0x3055
-    "EGL_CLIENT_APIS",              # 0x308D
-])
-
-EGLSurfaceAttrib = FakeEnum(EGLint, [
-    "EGL_HEIGHT",                   # 0x3056
-    "EGL_WIDTH",                    # 0x3057
-    "EGL_LARGEST_PBUFFER",          # 0x3058
-    "EGL_TEXTURE_FORMAT",           # 0x3080
-    "EGL_TEXTURE_TARGET",           # 0x3081
-    "EGL_MIPMAP_TEXTURE",           # 0x3082
-    "EGL_MIPMAP_LEVEL",             # 0x3083
-    "EGL_RENDER_BUFFER",            # 0x3086
-    "EGL_VG_COLORSPACE",            # 0x3087
-    "EGL_VG_ALPHA_FORMAT",          # 0x3088
-    "EGL_HORIZONTAL_RESOLUTION",    # 0x3090
-    "EGL_VERTICAL_RESOLUTION",      # 0x3091
-    "EGL_PIXEL_ASPECT_RATIO",       # 0x3092
-    "EGL_SWAP_BEHAVIOR",            # 0x3093
-    "EGL_MULTISAMPLE_RESOLVE",      # 0x3099
-    "EGL_NONE",
-
-    # EGL_KHR_lock_surface
-    "EGL_BITMAP_POINTER_KHR",                   # 0x30C6
-    "EGL_BITMAP_PITCH_KHR",                     # 0x30C7
-    "EGL_BITMAP_ORIGIN_KHR",                    # 0x30C8
-    "EGL_BITMAP_PIXEL_RED_OFFSET_KHR",          # 0x30C9
-    "EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR",        # 0x30CA
-    "EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR",         # 0x30CB
-    "EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR",        # 0x30CC
-    "EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR",    # 0x30CD
-    # EGL_KHR_lock_surface2
-    "EGL_BITMAP_PIXEL_SIZE_KHR",                # 0x3110
-
-    # EGL_HI_clientpixmap
-    "EGL_CLIENT_PIXMAP_POINTER_HI",             # 0x8F74
-
-    # EGL_NV_post_sub_buffer
-    "EGL_POST_SUB_BUFFER_SUPPORTED_NV",         # 0x30BE
-])
-
-EGLContextAttrib = FakeEnum(EGLint, [
-    "EGL_CONTEXT_CLIENT_TYPE",      # 0x3097
-    "EGL_CONTEXT_CLIENT_VERSION",   # 0x3098
 
-    # EGL_IMG_context_priority
-    "EGL_CONTEXT_PRIORITY_LEVEL_IMG",   # 0x3100
-
-    "EGL_NONE",
-])
-
-EGLAPI = FakeEnum(EGLenum, [
-    "EGL_OPENGL_ES_API",            # 0x30A0
-    "EGL_OPENVG_API",               # 0x30A1
-    "EGL_OPENGL_API",               # 0x30A2
-])
-
-EGLClientBufferType = FakeEnum(EGLenum, [
-    "EGL_OPENVG_IMAGE",             # 0x3096
-])
-
-EGLBufferType = FakeEnum(EGLint, [
-    "EGL_BACK_BUFFER",              # 0x3084
-    "EGL_SINGLE_BUFFER",            # 0x3085
-])
-
-EGLEngine = FakeEnum(EGLint, [
-    "EGL_CORE_NATIVE_ENGINE",       # 0x305B
-])
-
-# EGL_KHR_lock_surface
-EGLLockSurfaceAttrib = FakeEnum(EGLint, [
-    "EGL_MAP_PRESERVE_PIXELS_KHR",  # 0x30C4
-    "EGL_LOCK_USAGE_HINT_KHR",      # 0x30C5
-])
+# an alias of EGLenum
+EGLint_enum = Alias("EGLint", EGLenum)
+EGLattrib = EGLint_enum
 
 # EGL_KHR_image_base
 EGLImageKHR = Opaque("EGLImageKHR")
 
-EGLImageKHRAttrib = FakeEnum(EGLint, [
-    "EGL_IMAGE_PRESERVED_KHR",      # 0x30D2
+# EGL_KHR_reusable_sync
+EGLSyncKHR = Opaque("EGLSyncKHR")
+EGLTimeKHR = Alias("EGLTimeKHR", UInt64)
 
-    # EGL_KHR_gl_*_image
-    "EGL_GL_TEXTURE_LEVEL_KHR",     # 0x30BC
-    "EGL_GL_TEXTURE_ZOFFSET_KHR",   # 0x30BD
+# EGL_NV_sync
+EGLSyncNV = Alias("EGLSyncNV", EGLSyncKHR)
+EGLTimeNV = Alias("EGLTimeNV", EGLTimeKHR)
 
-    "EGL_NONE",
+# EGL_HI_clientpixmap
+EGLClientPixmapHI = Struct("struct EGLClientPixmapHI", [
+  (OpaquePointer(Void), "pData"),
+  (EGLint, "iWidth"),
+  (EGLint, "iHeight"),
+  (EGLint, "iStride"),
 ])
 
-EGLImageKHRTarget = FakeEnum(EGLenum, [
-    # EGL_KHR_image_pixmap
-    "EGL_NATIVE_PIXMAP_KHR",                    # 0x30B0
+# EGL_NV_system_time
+EGLuint64NV = Alias("EGLuint64NV", UInt64)
 
-    # EGL_KHR_vg_parent_image
-    "EGL_VG_PARENT_IMAGE_KHR",                  # 0x30BA
+eglapi = Module("EGL")
 
-    # EGL_KHR_gl_*_image
-    "EGL_GL_TEXTURE_2D_KHR",                    # 0x30B1
-    "EGL_GL_TEXTURE_3D_KHR",                    # 0x30B2
-    "EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR",   # 0x30B3
-    "EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR",   # 0x30B4
-    "EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR",   # 0x30B5
-    "EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR",   # 0x30B6
-    "EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR",   # 0x30B7
-    "EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR",   # 0x30B8
-    "EGL_GL_RENDERBUFFER_KHR",                  # 0x30B9
-
-    # EGL_MESA_drm_image
-    "EGL_DRM_BUFFER_MESA",                      # 0x31D3
+EGLSurfaceFlags = Flags(Int, [
+    'EGL_MULTISAMPLE_RESOLVE_BOX_BIT',
+    'EGL_PBUFFER_BIT',
+    'EGL_PIXMAP_BIT',
+    'EGL_SWAP_BEHAVIOR_PRESERVED_BIT',
+    'EGL_VG_ALPHA_FORMAT_PRE_BIT',
+    'EGL_VG_COLORSPACE_LINEAR_BIT',
+    'EGL_WINDOW_BIT'
 ])
 
-# EGL_KHR_reusable_sync
-EGLSyncKHR = Opaque("EGLSyncKHR")
-EGLTimeKHR = Alias("EGLTimeKHR", UInt64)
-
-EGLSyncKHRType = FakeEnum(EGLenum, [
-    "EGL_SYNC_REUSABLE_KHR",        # 0x30FA
-
-    # EGL_KHR_fence_sync
-    "EGL_SYNC_FENCE_KHR",           # 0x30F9
+EGLConformantFlags = Flags(Int, ['EGL_OPENGL_BIT','EGL_OPENGL_ES_BIT', 'EGL_OPENGL_ES2_BIT', 'EGL_OPENVG_BIT',])
+
+
+EGLVGAlphaFormat = FakeEnum(Int, ['EGL_VG_ALPHA_FORMAT_NONPRE', 'EGL_VG_ALPHA_FORMAT_PRE'])
+EGLVGColorspace = FakeEnum(Int, ['EGL_VG_COLORSPACE_sRGB', 'EGL_VG_COLORSPACE_LINEAR'])
+EGLTextureFormat = FakeEnum(Int, ['EGL_NO_TEXTURE', 'EGL_TEXTURE_RGB', 'EGL_TEXTURE_RGBA'])
+EGLTextureTarget = FakeEnum(Int, ['EGL_TEXTURE_2D', 'EGL_NO_TEXTURE' ])
+
+def EGLAttribArray(values):
+    return AttribArray(Const(EGLint_enum), values, terminator = 'EGL_NONE')
+
+EGLConfigAttribs = EGLAttribArray([
+    ('EGL_ALPHA_MASK_SIZE', UInt),
+    ('EGL_ALPHA_SIZE', UInt),
+    ('EGL_BIND_TO_TEXTURE_RGB', EGLBoolean),
+    ('EGL_BIND_TO_TEXTURE_RGBA', EGLBoolean),
+    ('EGL_BLUE_SIZE', UInt),
+    ('EGL_BUFFER_SIZE', UInt),
+    ('EGL_COLOR_BUFFER_TYPE', FakeEnum(Int, ['EGL_RGB_BUFFER', 'EGL_LUMINANCE_BUFFER'])),
+    ('EGL_CONFIG_CAVEAT', FakeEnum(Int, ['EGL_DONT_CARE', 'EGL_NONE', 'EGL_SLOW_CONFIG', 'EGL_NON_CONFORMANT_CONFIG'])),
+    ('EGL_CONFIG_ID', Int),
+    ('EGL_CONFORMANT', EGLConformantFlags),
+    ('EGL_DEPTH_SIZE', Int),
+    ('EGL_GREEN_SIZE', UInt),
+    ('EGL_LEVEL', Int),
+    ('EGL_LUMINANCE_SIZE', UInt),
+    ('EGL_MATCH_NATIVE_PIXMAP', Int),
+    ('EGL_NATIVE_RENDERABLE', FakeEnum(Int, ['EGL_DONT_CARE', 'EGL_TRUE', 'EGL_FALSE'])),
+    ('EGL_MAX_SWAP_INTERVAL', Int),
+    ('EGL_MIN_SWAP_INTERVAL', Int),
+    ('EGL_RED_SIZE', UInt),
+    ('EGL_SAMPLE_BUFFERS', Int),
+    ('EGL_SAMPLES', Int),
+    ('EGL_STENCIL_SIZE', UInt),
+    ('EGL_RENDERABLE_TYPE', EGLConformantFlags),
+    ('EGL_SURFACE_TYPE', EGLSurfaceFlags),
+    ('EGL_TRANSPARENT_TYPE', FakeEnum(Int, ['EGL_NONE', 'EGL_TRANSPARENT_RGB'])),
+    ('EGL_TRANSPARENT_RED_VALUE', Int),
+    ('EGL_TRANSPARENT_GREEN_VALUE', Int),
+    ('EGL_TRANSPARENT_BLUE_VALUE ', Int)
 ])
 
-EGLSyncKHRAttrib = FakeEnum(EGLint, [
-    "EGL_SYNC_STATUS_KHR",          # 0x30F1
-    "EGL_SYNC_TYPE_KHR",            # 0x30F7
+EGLWindowsSurfaceAttribs = EGLAttribArray([
+    ('EGL_RENDER_BUFFER', FakeEnum(Int, ['EGL_SINGLE_BUFFER', 'EGL_BACK_BUFFER'])),
+    ('EGL_VG_ALPHA_FORMAT', EGLVGAlphaFormat),
+    ('EGL_VG_COLORSPACE', EGLVGColorspace)])
 
-    # EGL_KHR_fence_sync
-    "EGL_SYNC_CONDITION_KHR",       # 0x30F8
-
-    "EGL_NONE",
+EGLPixmapSurfaceAttribs = EGLAttribArray([
+    ('EGL_VG_ALPHA_FORMAT', EGLVGAlphaFormat),
+    ('EGL_VG_COLORSPACE', EGLVGColorspace)
 ])
 
-EGLSyncKHRMode = FakeEnum(EGLenum, [
-    "EGL_SIGNALED_KHR",             # 0x30F2
-    "EGL_UNSIGNALED_KHR",           # 0x30F3
+EGLPbufferAttribs = EGLAttribArray([
+    ('EGL_HEIGHT', Int),
+    ('EGL_LARGEST_PBUFFER', EGLBoolean),
+    ('EGL_MIPMAP_TEXTURE', UInt),
+    ('EGL_TEXTURE_FORMAT', EGLTextureFormat),
+    ('EGL_TEXTURE_TARGET', EGLTextureTarget),
+    ('EGL_VG_ALPHA_FORMAT', EGLVGAlphaFormat),
+    ('EGL_VG_COLORSPACE', EGLVGColorspace),
+    ('EGL_WIDTH', Int)
 ])
 
-# EGL_NV_sync
-EGLSyncNV = Alias("EGLSyncNV", EGLSyncKHR)
-EGLTimeNV = Alias("EGLTimeKHR", EGLTimeKHR)
+EGLPbufferFromClientBufferAttribs = EGLAttribArray([
+    ('EGL_MIPMAP_TEXTURE', EGLBoolean),
+    ('EGL_TEXTURE_FORMAT', EGLTextureFormat),
+    ('EGL_TEXTURE_TARGET', EGLTextureTarget)
+])
 
-# EGL_HI_clientpixmap
-EGLClientPixmapHI = Struct("struct EGLClientPixmapHI", [
-  (OpaquePointer(Void), "pData"),
-  (EGLint, "iWidth"),
-  (EGLint, "iHeight"),
-  (EGLint, "iStride"),
+EGLDrmImageMesaAttribs = EGLAttribArray([
+    ('EGL_DRM_BUFFER_FORMAT_MESA', FakeEnum(Int, ['EGL_DRM_BUFFER_FORMAT_ARGB32_MESA'])),
+    ('EGL_DRM_BUFFER_USE_MESA', Flags(Int, ['EGL_DRM_BUFFER_USE_SCANOUT_MESA', 'EGL_DRM_BUFFER_USE_SHARE_MESA']))
 ])
 
-# EGL_MESA_drm_image
-EGLCreateDRMImageAttrib = FakeEnum(EGLint, [
-    "EGL_DRM_BUFFER_FORMAT_MESA",   # 0x31D1
-    "EGL_DRM_BUFFER_USE_MESA",      # 0x31D2
-    "EGL_DRM_BUFFER_STRIDE_MESA",   # 0x31D4
+EGLLockSurfaceKHRAttribs = EGLAttribArray([
+    ('EGL_MAP_PRESERVE_PIXELS_KHR', EGLBoolean),
+    ('EGL_LOCK_USAGE_HINT_KHR', Flags(Int, ['EGL_READ_SURFACE_BIT_KHR', 'EGL_WRITE_SURFACE_BIT_KHR']))
+])
 
-    "EGL_WIDTH",
-    "EGL_HEIGHT",
-    "EGL_NONE",
+EGLFenceSyncNVAttribs = EGLAttribArray([
+    ('EGL_SYNC_STATUS_NV', Flags(Int, ['EGL_SIGNALED_NV', 'EGL_UNSIGNALED_NV']))
 ])
 
-eglapi = API("EGL")
+EGLProc = Opaque("__eglMustCastToProperFunctionPointerType")
 
-PROC = Opaque("__eglMustCastToProperFunctionPointerType")
+def GlFunction(*args, **kwargs):
+    kwargs.setdefault('call', 'GL_APIENTRY')
+    return Function(*args, **kwargs)
 
-eglapi.add_functions([
+eglapi.addFunctions([
     # EGL 1.4
-    Function(EGLError, "eglGetError", [], sideeffects=False),
+    Function(EGLint_enum, "eglGetError", [], sideeffects=False),
 
     Function(EGLDisplay, "eglGetDisplay", [(EGLNativeDisplayType, "display_id")]),
     Function(EGLBoolean, "eglInitialize", [(EGLDisplay, "dpy"), Out(Pointer(EGLint), "major"), Out(Pointer(EGLint), "minor")]),
     Function(EGLBoolean, "eglTerminate", [(EGLDisplay, "dpy")]),
 
-    Function(Const(String("char *")), "eglQueryString", [(EGLDisplay, "dpy"), (EGLName, "name")], sideeffects=False),
+    Function(ConstCString, "eglQueryString", [(EGLDisplay, "dpy"), (EGLint_enum, "name")], sideeffects=False),
 
     Function(EGLBoolean, "eglGetConfigs", [(EGLDisplay, "dpy"), (Array(EGLConfig, "config_size"), "configs"), (EGLint, "config_size"), Out(Pointer(EGLint), "num_config")]),
-    Function(EGLBoolean, "eglChooseConfig", [(EGLDisplay, "dpy"), (Array(Const(EGLConfigAttrib), "__AttribList_size(attrib_list, EGL_NONE)"), "attrib_list"), (Array(EGLConfig, "config_size"), "configs"), (EGLint, "config_size"), Out(Pointer(EGLint), "num_config")]),
-    Function(EGLBoolean, "eglGetConfigAttrib", [(EGLDisplay, "dpy"), (EGLConfig, "config"), (EGLConfigAttrib, "attribute"), Out(Pointer(EGLint), "value")], sideeffects=False),
+    Function(EGLBoolean, "eglChooseConfig", [(EGLDisplay, "dpy"), (EGLConfigAttribs, "attrib_list"), (Array(EGLConfig, "config_size"), "configs"), (EGLint, "config_size"), Out(Pointer(EGLint), "num_config")]),
+    Function(EGLBoolean, "eglGetConfigAttrib", [(EGLDisplay, "dpy"), (EGLConfig, "config"), (EGLattrib, "attribute"), Out(Pointer(EGLint), "value")], sideeffects=False),
 
-    Function(EGLSurface, "eglCreateWindowSurface", [(EGLDisplay, "dpy"), (EGLConfig, "config"), (EGLNativeWindowType, "win"), (Array(Const(EGLSurfaceAttrib), "__AttribList_size(attrib_list, EGL_NONE)"), "attrib_list")]),
-    Function(EGLSurface, "eglCreatePbufferSurface", [(EGLDisplay, "dpy"), (EGLConfig, "config"), (Array(Const(EGLSurfaceAttrib), "__AttribList_size(attrib_list, EGL_NONE)"), "attrib_list")]),
-    Function(EGLSurface, "eglCreatePixmapSurface", [(EGLDisplay, "dpy"), (EGLConfig, "config"), (EGLNativePixmapType, "pixmap"), (Array(Const(EGLSurfaceAttrib), "__AttribList_size(attrib_list, EGL_NONE)"), "attrib_list")]),
+    Function(EGLSurface, "eglCreateWindowSurface", [(EGLDisplay, "dpy"), (EGLConfig, "config"), (EGLNativeWindowType, "win"), (EGLWindowsSurfaceAttribs, "attrib_list")]),
+    Function(EGLSurface, "eglCreatePbufferSurface", [(EGLDisplay, "dpy"), (EGLConfig, "config"), (EGLPbufferAttribs, "attrib_list")]),
+    Function(EGLSurface, "eglCreatePixmapSurface", [(EGLDisplay, "dpy"), (EGLConfig, "config"), (EGLNativePixmapType, "pixmap"), (EGLPixmapSurfaceAttribs, "attrib_list")]),
     Function(EGLBoolean, "eglDestroySurface", [(EGLDisplay, "dpy"), (EGLSurface, "surface")]),
-    Function(EGLBoolean, "eglQuerySurface", [(EGLDisplay, "dpy"), (EGLSurface, "surface"), (EGLSurfaceAttrib, "attribute"), Out(Pointer(EGLint), "value")], sideeffects=False),
+    Function(EGLBoolean, "eglQuerySurface", [(EGLDisplay, "dpy"), (EGLSurface, "surface"), (EGLattrib, "attribute"), Out(Pointer(EGLint), "value")], sideeffects=False),
 
-    Function(EGLBoolean, "eglBindAPI", [(EGLAPI, "api")]),
-    Function(EGLAPI, "eglQueryAPI", [], sideeffects=False),
+    Function(EGLBoolean, "eglBindAPI", [(EGLenum, "api")]),
+    Function(EGLenum, "eglQueryAPI", [], sideeffects=False),
 
     Function(EGLBoolean, "eglWaitClient", []),
 
     Function(EGLBoolean, "eglReleaseThread", []),
 
-    Function(EGLSurface, "eglCreatePbufferFromClientBuffer", [(EGLDisplay, "dpy"), (EGLClientBufferType, "buftype"), (EGLClientBuffer, "buffer"), (EGLConfig, "config"), (Array(Const(EGLSurfaceAttrib), "__AttribList_size(attrib_list, EGL_NONE)"), "attrib_list")]),
+    Function(EGLSurface, "eglCreatePbufferFromClientBuffer", [(EGLDisplay, "dpy"), (EGLenum, "buftype"), (EGLClientBuffer, "buffer"), (EGLConfig, "config"), (EGLPbufferFromClientBufferAttribs, "attrib_list")]),
 
-    Function(EGLBoolean, "eglSurfaceAttrib", [(EGLDisplay, "dpy"), (EGLSurface, "surface"), (EGLSurfaceAttrib, "attribute"), (EGLint, "value")]),
-    Function(EGLBoolean, "eglBindTexImage", [(EGLDisplay, "dpy"), (EGLSurface, "surface"), (EGLBufferType, "buffer")]),
-    Function(EGLBoolean, "eglReleaseTexImage", [(EGLDisplay, "dpy"), (EGLSurface, "surface"), (EGLBufferType, "buffer")]),
+    Function(EGLBoolean, "eglSurfaceAttrib", [(EGLDisplay, "dpy"), (EGLSurface, "surface"), (EGLattrib, "attribute"), (EGLint, "value")]),
+    Function(EGLBoolean, "eglBindTexImage", [(EGLDisplay, "dpy"), (EGLSurface, "surface"), (EGLattrib, "buffer")]),
+    Function(EGLBoolean, "eglReleaseTexImage", [(EGLDisplay, "dpy"), (EGLSurface, "surface"), (EGLattrib, "buffer")]),
 
     Function(EGLBoolean, "eglSwapInterval", [(EGLDisplay, "dpy"), (EGLint, "interval")]),
 
-    Function(EGLContext, "eglCreateContext", [(EGLDisplay, "dpy"), (EGLConfig, "config"), (EGLContext, "share_context"), (Array(Const(EGLContextAttrib), "__AttribList_size(attrib_list, EGL_NONE)"), "attrib_list")]),
+    Function(EGLContext, "eglCreateContext", [(EGLDisplay, "dpy"), (EGLConfig, "config"), (EGLContext, "share_context"), (AttribArray(Const(EGLint_enum), [('EGL_CONTEXT_CLIENT_VERSION', Int)]), "attrib_list")]),
     Function(EGLBoolean, "eglDestroyContext", [(EGLDisplay, "dpy"), (EGLContext, "ctx")]),
     Function(EGLBoolean, "eglMakeCurrent", [(EGLDisplay, "dpy"), (EGLSurface, "draw"), (EGLSurface, "read"), (EGLContext, "ctx")]),
 
     Function(EGLContext, "eglGetCurrentContext", [], sideeffects=False),
-    Function(EGLSurface, "eglGetCurrentSurface", [(EGLBufferType, "readdraw")], sideeffects=False),
+    Function(EGLSurface, "eglGetCurrentSurface", [(EGLattrib, "readdraw")], sideeffects=False),
     Function(EGLDisplay, "eglGetCurrentDisplay", [], sideeffects=False),
 
-    Function(EGLBoolean, "eglQueryContext", [(EGLDisplay, "dpy"), (EGLContext, "ctx"), (EGLContextAttrib, "attribute"), Out(Pointer(EGLint), "value")], sideeffects=False),
+    Function(EGLBoolean, "eglQueryContext", [(EGLDisplay, "dpy"), (EGLContext, "ctx"), (EGLattrib, "attribute"), Out(Pointer(EGLint), "value")], sideeffects=False),
 
     Function(EGLBoolean, "eglWaitGL", []),
-    Function(EGLBoolean, "eglWaitNative", [(EGLEngine, "engine")]),
+    Function(EGLBoolean, "eglWaitNative", [(EGLattrib, "engine")]),
     Function(EGLBoolean, "eglSwapBuffers", [(EGLDisplay, "dpy"), (EGLSurface, "surface")]),
     Function(EGLBoolean, "eglCopyBuffers", [(EGLDisplay, "dpy"), (EGLSurface, "surface"), (EGLNativePixmapType, "target")]),
 
-    Function(PROC, "eglGetProcAddress", [(Const(CString), "procname")]),
+    Function(EGLProc, "eglGetProcAddress", [(ConstCString, "procname")]),
 
     # EGL_KHR_lock_surface
-    Function(EGLBoolean, "eglLockSurfaceKHR", [(EGLDisplay, "display"), (EGLSurface, "surface"), (Array(Const(EGLLockSurfaceAttrib), "__AttribList_size(attrib_list, EGL_NONE)"), "attrib_list")]),
+    # EGL_KHR_lock_surface2
+    Function(EGLBoolean, "eglLockSurfaceKHR", [(EGLDisplay, "display"), (EGLSurface, "surface"), (EGLLockSurfaceKHRAttribs, "attrib_list")]),
     Function(EGLBoolean, "eglUnlockSurfaceKHR", [(EGLDisplay, "display"), (EGLSurface, "surface")]),
 
     # EGL_KHR_image_base
-    Function(EGLImageKHR, "eglCreateImageKHR", [(EGLDisplay, "dpy"), (EGLContext, "ctx"), (EGLImageKHRTarget, "target"), (EGLClientBuffer, "buffer"), (Array(Const(EGLImageKHRAttrib), "__AttribList_size(attrib_list, EGL_NONE)"), "attrib_list")]),
+    Function(EGLImageKHR, "eglCreateImageKHR", [(EGLDisplay, "dpy"), (EGLContext, "ctx"), (EGLenum, "target"), (EGLClientBuffer, "buffer"), (AttribArray(Const(EGLint_enum), [('EGL_IMAGE_PRESERVED_KHR', EGLBoolean)]), "attrib_list")]),
     Function(EGLBoolean, "eglDestroyImageKHR", [(EGLDisplay, "dpy"), (EGLImageKHR, "image")]),
 
+    # EGL_KHR_fence_sync
     # EGL_KHR_reusable_sync
-    Function(EGLSyncKHR, "eglCreateSyncKHR", [(EGLDisplay, "dpy"), (EGLSyncKHRType, "type"), (Array(Const(EGLSyncKHRAttrib), "__AttribList_size(attrib_list, EGL_NONE)"), "attrib_list")]),
+    Function(EGLSyncKHR, "eglCreateSyncKHR", [(EGLDisplay, "dpy"), (EGLenum, "type"), (EGLAttribArray([]), "attrib_list")]),
     Function(EGLBoolean, "eglDestroySyncKHR", [(EGLDisplay, "dpy"), (EGLSyncKHR, "sync")]),
     Function(EGLint, "eglClientWaitSyncKHR", [(EGLDisplay, "dpy"), (EGLSyncKHR, "sync"), (EGLint, "flags"), (EGLTimeKHR, "timeout")]),
-    Function(EGLBoolean, "eglSignalSyncKHR", [(EGLDisplay, "dpy"), (EGLSyncKHR, "sync"), (EGLSyncKHRMode, "mode")]),
-    Function(EGLBoolean, "eglGetSyncAttribKHR", [(EGLDisplay, "dpy"), (EGLSyncKHR, "sync"), (EGLSyncKHRAttrib, "attribute"), Out(Pointer(EGLint), "value")], sideeffects=False),
+    Function(EGLBoolean, "eglSignalSyncKHR", [(EGLDisplay, "dpy"), (EGLSyncKHR, "sync"), (EGLenum, "mode")]),
+    Function(EGLBoolean, "eglGetSyncAttribKHR", [(EGLDisplay, "dpy"), (EGLSyncKHR, "sync"), (EGLattrib, "attribute"), Out(Pointer(EGLint), "value")], sideeffects=False),
 
     # EGL_NV_sync
-    Function(EGLSyncNV, "eglCreateFenceSyncNV", [(EGLDisplay, "dpy"), (EGLenum, "condition"), (Array(Const(EGLint), "__AttribList_size(attrib_list, EGL_NONE)"), "attrib_list")]),
+    Function(EGLSyncNV, "eglCreateFenceSyncNV", [(EGLDisplay, "dpy"), (EGLenum, "condition"), (EGLFenceSyncNVAttribs, "attrib_list")]),
     Function(EGLBoolean, "eglDestroySyncNV", [(EGLSyncNV, "sync")]),
     Function(EGLBoolean, "eglFenceNV", [(EGLSyncNV, "sync")]),
     Function(EGLint, "eglClientWaitSyncNV", [(EGLSyncNV, "sync"), (EGLint, "flags"), (EGLTimeNV, "timeout")]),
     Function(EGLBoolean, "eglSignalSyncNV", [(EGLSyncNV, "sync"), (EGLenum, "mode")]),
-    Function(EGLBoolean, "eglGetSyncAttribNV", [(EGLSyncNV, "sync"), (EGLint, "attribute"), Out(Pointer(EGLint), "value")], sideeffects=False),
+    Function(EGLBoolean, "eglGetSyncAttribNV", [(EGLSyncNV, "sync"), (EGLattrib, "attribute"), Out(Pointer(EGLint), "value")], sideeffects=False),
 
     # EGL_HI_clientpixmap
     Function(EGLSurface, "eglCreatePixmapSurfaceHI", [(EGLDisplay, "dpy"), (EGLConfig, "config"), (Pointer(EGLClientPixmapHI), "pixmap")]),
 
     # EGL_MESA_drm_image
-    Function(EGLImageKHR, "eglCreateDRMImageMESA", [(EGLDisplay, "dpy"), (Array(Const(EGLCreateDRMImageAttrib), "__AttribList_size(attrib_list, EGL_NONE)"), "attrib_list")]),
+    Function(EGLImageKHR, "eglCreateDRMImageMESA", [(EGLDisplay, "dpy"), (EGLDrmImageMesaAttribs, "attrib_list")]),
     Function(EGLBoolean, "eglExportDRMImageMESA", [(EGLDisplay, "dpy"), (EGLImageKHR, "image"), Out(Pointer(EGLint), "name"), Out(Pointer(EGLint), "handle"), Out(Pointer(EGLint), "stride")]),
 
     # EGL_NV_post_sub_buffer
     Function(EGLBoolean, "eglPostSubBufferNV", [(EGLDisplay, "dpy"), (EGLSurface, "surface"), (EGLint, "x"), (EGLint, "y"), (EGLint, "width"), (EGLint, "height")]),
+
+    # EGL_ANGLE_query_surface_pointer
+    Function(EGLBoolean, "eglQuerySurfacePointerANGLE", [(EGLDisplay, "dpy"), (EGLSurface, "surface"), (EGLattrib, "attribute"), Out(Pointer(OpaquePointer(Void)), "value")], sideeffects=False),
+
+    # EGL_NV_system_time
+    Function(EGLuint64NV, "eglGetSystemTimeFrequencyNV", [], sideeffects=False),
+    Function(EGLuint64NV, "eglGetSystemTimeNV", [], sideeffects=False),
+
+    # GL_OES_EGL_image
+    GlFunction(Void, "glEGLImageTargetTexture2DOES", [(GLenum, "target"), (EGLImageKHR, "image")]),
+    GlFunction(Void, "glEGLImageTargetRenderbufferStorageOES", [(GLenum, "target"), (EGLImageKHR, "image")]),
 ])