]> git.cworth.org Git - apitrace/blobdiff - specs/eglapi.py
Use skiplist-based FastCallSet within trace::CallSet
[apitrace] / specs / eglapi.py
index e7ea617c4fbe4c785c7a8ef836a95bbb75535031..510e0fab4b2eabbe032ced568598628fd287899c 100644 (file)
@@ -27,6 +27,7 @@
 
 
 from stdapi import *
+from gltypes import *
 
 EGLNativeDisplayType = Opaque("EGLNativeDisplayType")
 EGLNativeWindowType = Opaque("EGLNativeWindowType")
@@ -39,14 +40,12 @@ 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
@@ -66,7 +65,16 @@ EGLError = FakeEnum(EGLint, [
     "EGL_CONTEXT_LOST",             # 0x300E  /* EGL 1.1 - IMG_power_management */
 ])
 
-EGLConfigAttrib = FakeEnum(EGLint, [
+EGLName = FakeEnum(EGLint, [
+    "EGL_VENDOR",                   # 0x3053
+    "EGL_VERSION",                  # 0x3054
+    "EGL_EXTENSIONS",               # 0x3055
+    "EGL_CLIENT_APIS",              # 0x308D
+])
+
+# collection of all other enum values
+EGLenum = Enum("EGLenum", [
+    # config attributes
     "EGL_BUFFER_SIZE",              # 0x3020
     "EGL_ALPHA_SIZE",               # 0x3021
     "EGL_BLUE_SIZE",                # 0x3022
@@ -102,28 +110,14 @@ EGLConfigAttrib = FakeEnum(EGLint, [
     "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
-])
+    # config attribute values
+    "EGL_SLOW_CONFIG",              # 0x3050  /* EGL_CONFIG_CAVEAT value */
+    "EGL_NON_CONFORMANT_CONFIG",    # 0x3051  /* EGL_CONFIG_CAVEAT value */
+    "EGL_TRANSPARENT_RGB",          # 0x3052  /* EGL_TRANSPARENT_TYPE value */
+    "EGL_RGB_BUFFER",               # 0x308E  /* EGL_COLOR_BUFFER_TYPE value */
+    "EGL_LUMINANCE_BUFFER",         # 0x308F  /* EGL_COLOR_BUFFER_TYPE value */
 
-EGLSurfaceAttrib = FakeEnum(EGLint, [
+    # surface attributes
     "EGL_HEIGHT",                   # 0x3056
     "EGL_WIDTH",                    # 0x3057
     "EGL_LARGEST_PBUFFER",          # 0x3058
@@ -139,86 +133,38 @@ EGLSurfaceAttrib = FakeEnum(EGLint, [
     "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
-
-    # EGL_NV_coverage_sample_resolve
-    "EGL_COVERAGE_SAMPLE_RESOLVE_NV",           # 0x3131
-])
-
-EGLContextAttrib = FakeEnum(EGLint, [
+    # surface attribute values
+    "EGL_NO_TEXTURE",               # 0x305C
+    "EGL_TEXTURE_RGB",              # 0x305D
+    "EGL_TEXTURE_RGBA",             # 0x305E
+    "EGL_TEXTURE_2D",               # 0x305F
+    "EGL_VG_COLORSPACE_sRGB",       # 0x3089  /* EGL_VG_COLORSPACE value */
+    "EGL_VG_COLORSPACE_LINEAR",     # 0x308A  /* EGL_VG_COLORSPACE value */
+    "EGL_VG_ALPHA_FORMAT_NONPRE",   # 0x308B  /* EGL_ALPHA_FORMAT value */
+    "EGL_VG_ALPHA_FORMAT_PRE",      # 0x308C  /* EGL_ALPHA_FORMAT value */
+    "EGL_BUFFER_PRESERVED",         # 0x3094  /* EGL_SWAP_BEHAVIOR value */
+    "EGL_BUFFER_DESTROYED",         # 0x3095  /* EGL_SWAP_BEHAVIOR value */
+    "EGL_MULTISAMPLE_RESOLVE_DEFAULT", # 0x309A  /* EGL_MULTISAMPLE_RESOLVE value */
+    "EGL_MULTISAMPLE_RESOLVE_BOX",     # 0x309B  /* EGL_MULTISAMPLE_RESOLVE value */
+
+    # context attributes
     "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, [
+    # misc
+    "EGL_DRAW",                     # 0x3059
+    "EGL_READ",                     # 0x305A
+    "EGL_CORE_NATIVE_ENGINE",       # 0x305B
+    "EGL_BACK_BUFFER",              # 0x3084
+    "EGL_SINGLE_BUFFER",            # 0x3085
+    "EGL_OPENVG_IMAGE",             # 0x3096
     "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
-])
-
-# EGL_KHR_image_base
-EGLImageKHR = Opaque("EGLImageKHR")
-
-EGLImageKHRAttrib = FakeEnum(EGLint, [
-    "EGL_IMAGE_PRESERVED_KHR",      # 0x30D2
 
-    # EGL_KHR_gl_*_image
-    "EGL_GL_TEXTURE_LEVEL_KHR",     # 0x30BC
-    "EGL_GL_TEXTURE_ZOFFSET_KHR",   # 0x30BD
-
-    "EGL_NONE",
-])
-
-EGLImageKHRTarget = FakeEnum(EGLenum, [
-    # EGL_KHR_image_pixmap
+    # image targets
     "EGL_NATIVE_PIXMAP_KHR",                    # 0x30B0
-
-    # EGL_KHR_vg_parent_image
-    "EGL_VG_PARENT_IMAGE_KHR",                  # 0x30BA
-
-    # 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
@@ -228,40 +174,109 @@ EGLImageKHRTarget = FakeEnum(EGLenum, [
     "EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR",   # 0x30B7
     "EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR",   # 0x30B8
     "EGL_GL_RENDERBUFFER_KHR",                  # 0x30B9
+    "EGL_VG_PARENT_IMAGE_KHR",                  # 0x30BA
+
+    # image attributes
+    "EGL_GL_TEXTURE_LEVEL_KHR",                 # 0x30BC
+    "EGL_GL_TEXTURE_ZOFFSET_KHR",               # 0x30BD
+    "EGL_IMAGE_PRESERVED_KHR",                  # 0x30D2
+
+    # sync types
+    "EGL_SYNC_FENCE_KHR",                       # 0x30F9
+    "EGL_SYNC_REUSABLE_KHR",                    # 0x30FA
+
+    # sync attributes
+    "EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR",     # 0x30F0
+    "EGL_SYNC_STATUS_KHR",                      # 0x30F1
+    "EGL_SIGNALED_KHR",                         # 0x30F2
+    "EGL_UNSIGNALED_KHR",                       # 0x30F3
+    "EGL_TIMEOUT_EXPIRED_KHR",                  # 0x30F5
+    "EGL_CONDITION_SATISFIED_KHR",              # 0x30F6
+    "EGL_SYNC_TYPE_KHR",                        # 0x30F7
+    "EGL_SYNC_CONDITION_KHR",                   # 0x30F8
+
+    # EGL_KHR_lock_surface / EGL_KHR_lock_surface2
+    "EGL_MATCH_FORMAT_KHR",                     # 0x3043
+    "EGL_FORMAT_RGB_565_EXACT_KHR",             # 0x30C0  /* EGL_MATCH_FORMAT_KHR value */
+    "EGL_FORMAT_RGB_565_KHR",                   # 0x30C1  /* EGL_MATCH_FORMAT_KHR value */
+    "EGL_FORMAT_RGBA_8888_EXACT_KHR",           # 0x30C2  /* EGL_MATCH_FORMAT_KHR value */
+    "EGL_FORMAT_RGBA_8888_KHR",                 # 0x30C3  /* EGL_MATCH_FORMAT_KHR value */
+    "EGL_MAP_PRESERVE_PIXELS_KHR",              # 0x30C4
+    "EGL_LOCK_USAGE_HINT_KHR",                  # 0x30C5
+    "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_LOWER_LEFT_KHR",                       # 0x30CE  /* EGL_BITMAP_ORIGIN_KHR value */
+    "EGL_UPPER_LEFT_KHR",                       # 0x30CF  /* EGL_BITMAP_ORIGIN_KHR value */
+    "EGL_BITMAP_PIXEL_SIZE_KHR",                # 0x3110
+
+    # EGL_ANGLE_surface_d3d_texture_2d_share_handle
+    "EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE",    # 0x3200
+
+    # EGL_HI_clientpixmap / EGL_HI_colorformats
+    "EGL_CLIENT_PIXMAP_POINTER_HI",             # 0x8F74
+    "EGL_COLOR_FORMAT_HI",                      # 0x8F70
+    "EGL_COLOR_RGB_HI",                         # 0x8F71
+    "EGL_COLOR_RGBA_HI",                        # 0x8F72
+    "EGL_COLOR_ARGB_HI",                        # 0x8F73
+
+    # EGL_IMG_context_priority
+    "EGL_CONTEXT_PRIORITY_LEVEL_IMG",           # 0x3100
+    "EGL_CONTEXT_PRIORITY_HIGH_IMG",            # 0x3101
+    "EGL_CONTEXT_PRIORITY_MEDIUM_IMG",          # 0x3102
+    "EGL_CONTEXT_PRIORITY_LOW_IMG",             # 0x3103
 
     # EGL_MESA_drm_image
     "EGL_DRM_BUFFER_MESA",                      # 0x31D3
-])
-
-# EGL_KHR_reusable_sync
-EGLSyncKHR = Opaque("EGLSyncKHR")
-EGLTimeKHR = Alias("EGLTimeKHR", UInt64)
+    "EGL_DRM_BUFFER_FORMAT_MESA",               # 0x31D1
+    "EGL_DRM_BUFFER_USE_MESA",                  # 0x31D2
+    "EGL_DRM_BUFFER_STRIDE_MESA",               # 0x31D4
 
-EGLSyncKHRType = FakeEnum(EGLenum, [
-    "EGL_SYNC_REUSABLE_KHR",        # 0x30FA
+    # EGL_NV_coverage_sample
+    "EGL_COVERAGE_BUFFERS_NV",                  # 0x30E0
+    "EGL_COVERAGE_SAMPLES_NV",                  # 0x30E1
 
-    # EGL_KHR_fence_sync
-    "EGL_SYNC_FENCE_KHR",           # 0x30F9
-])
+    # EGL_NV_coverage_sample_resolve
+    "EGL_COVERAGE_SAMPLE_RESOLVE_NV",           # 0x3131
 
-EGLSyncKHRAttrib = FakeEnum(EGLint, [
-    "EGL_SYNC_STATUS_KHR",          # 0x30F1
-    "EGL_SYNC_TYPE_KHR",            # 0x30F7
+    # EGL_NV_depth_nonlinear
+    "EGL_DEPTH_ENCODING_NV",                    # 0x30E2
+    "EGL_DEPTH_ENCODING_NONLINEAR_NV",          # 0x30E3
 
-    # EGL_KHR_fence_sync
-    "EGL_SYNC_CONDITION_KHR",       # 0x30F8
+    # EGL_NV_post_sub_buffer
+    "EGL_POST_SUB_BUFFER_SUPPORTED_NV",         # 0x30BE
 
-    "EGL_NONE",
+    # EGL_NV_sync
+    "EGL_SYNC_PRIOR_COMMANDS_COMPLETE_NV",      # 0x30E6
+    "EGL_SYNC_STATUS_NV",                       # 0x30E7
+    "EGL_SIGNALED_NV",                          # 0x30E8
+    "EGL_UNSIGNALED_NV",                        # 0x30E9
+    "EGL_ALREADY_SIGNALED_NV",                  # 0x30EA
+    "EGL_TIMEOUT_EXPIRED_NV",                   # 0x30EB
+    "EGL_CONDITION_SATISFIED_NV",               # 0x30EC
+    "EGL_SYNC_TYPE_NV",                         # 0x30ED
+    "EGL_SYNC_CONDITION_NV",                    # 0x30EE
+    "EGL_SYNC_FENCE_NV",                        # 0x30EF
 ])
 
-EGLSyncKHRMode = FakeEnum(EGLenum, [
-    "EGL_SIGNALED_KHR",             # 0x30F2
-    "EGL_UNSIGNALED_KHR",           # 0x30F3
-])
+# an alias of EGLenum
+EGLattrib = Alias("EGLint", EGLenum)
+
+# EGL_KHR_image_base
+EGLImageKHR = Opaque("EGLImageKHR")
+
+# EGL_KHR_reusable_sync
+EGLSyncKHR = Opaque("EGLSyncKHR")
+EGLTimeKHR = Alias("EGLTimeKHR", UInt64)
 
 # EGL_NV_sync
 EGLSyncNV = Alias("EGLSyncNV", EGLSyncKHR)
-EGLTimeNV = Alias("EGLTimeKHR", EGLTimeKHR)
+EGLTimeNV = Alias("EGLTimeNV", EGLTimeKHR)
 
 # EGL_HI_clientpixmap
 EGLClientPixmapHI = Struct("struct EGLClientPixmapHI", [
@@ -271,28 +286,20 @@ EGLClientPixmapHI = Struct("struct EGLClientPixmapHI", [
   (EGLint, "iStride"),
 ])
 
-# 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
+# EGL_NV_system_time
+EGLuint64NV = Alias("EGLuint64NV", UInt64)
 
-    "EGL_WIDTH",
-    "EGL_HEIGHT",
-    "EGL_NONE",
-])
+eglapi = Module("EGL")
 
-# EGL_ANGLE_query_surface_pointer
-EGLSurfacePointer = FakeEnum(EGLint, [
-    # EGL_ANGLE_surface_d3d_texture_2d_share_handle
-    "EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE",    # 0x3200
-])
+EGLAttribList = Array(Const(EGLattrib), "_AttribPairList_size(attrib_list, EGL_NONE)")
 
-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),
 
@@ -300,83 +307,91 @@ eglapi.add_functions([
     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"), (EGLName, "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"), (EGLAttribList, "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"), (EGLAttribList, "attrib_list")]),
+    Function(EGLSurface, "eglCreatePbufferSurface", [(EGLDisplay, "dpy"), (EGLConfig, "config"), (EGLAttribList, "attrib_list")]),
+    Function(EGLSurface, "eglCreatePixmapSurface", [(EGLDisplay, "dpy"), (EGLConfig, "config"), (EGLNativePixmapType, "pixmap"), (EGLAttribList, "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"), (EGLAttribList, "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"), (EGLAttribList, "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")]),
+    Function(EGLBoolean, "eglLockSurfaceKHR", [(EGLDisplay, "display"), (EGLSurface, "surface"), (EGLAttribList, "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"), (EGLAttribList, "attrib_list")]),
     Function(EGLBoolean, "eglDestroyImageKHR", [(EGLDisplay, "dpy"), (EGLImageKHR, "image")]),
 
     # 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"), (EGLAttribList, "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"), (EGLAttribList, "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"), (EGLAttribList, "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"), (EGLSurfacePointer, "attribute"), Out(Pointer(OpaquePointer(Void)), "value")], sideeffects=False),
+    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")]),
 ])