third_party
/
libepoxy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'registry'

Browse Source 
Conflicts:
	registry/egl.xml
	registry/gl.xml

The only diff we now have from the source is glUnmapBufferOES()'s
alias to normal glUnmapBuffer().
macos/v1.5.9
Eric Anholt 11 years ago
parent cfdb26c2a4 46ad30c54f
commit 8067f15e97
3 changed files with 918 additions and 392 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 89
      registry/egl.xml
  2. 1208
      registry/gl.xml
  3. 13
      registry/glx.xml

89
registry/egl.xml
Unescape View File

@ -52,6 +52,7 @@
<!-- These are actual EGL types. --> <!-- These are actual EGL types. -->
<type>typedef unsigned int <name>EGLBoolean</name>;</type> <type>typedef unsigned int <name>EGLBoolean</name>;</type>
<type>typedef unsigned int <name>EGLenum</name>;</type> <type>typedef unsigned int <name>EGLenum</name>;</type>
<type requires="khrplatform">typedef intptr_t <name>EGLAttribKHR</name>;</type>
<type>typedef void *<name>EGLConfig</name>;</type> <type>typedef void *<name>EGLConfig</name>;</type>
<type>typedef void *<name>EGLContext</name>;</type> <type>typedef void *<name>EGLContext</name>;</type>
<type>typedef void *<name>EGLDisplay</name>;</type> <type>typedef void *<name>EGLDisplay</name>;</type>
@ -269,8 +270,10 @@
<enum value="0x3088" name="EGL_ALPHA_FORMAT" alias="EGL_VG_ALPHA_FORMAT"/> <enum value="0x3088" name="EGL_ALPHA_FORMAT" alias="EGL_VG_ALPHA_FORMAT"/>
<enum value="0x3088" name="EGL_VG_ALPHA_FORMAT"/> <enum value="0x3088" name="EGL_VG_ALPHA_FORMAT"/>
<enum value="0x3089" name="EGL_COLORSPACE_sRGB" alias="EGL_VG_COLORSPACE_sRGB"/> <enum value="0x3089" name="EGL_COLORSPACE_sRGB" alias="EGL_VG_COLORSPACE_sRGB"/>
<enum value="0x3089" name="EGL_GL_COLORSPACE_SRGB_KHR" alias="EGL_VG_COLORSPACE_sRGB"/>
<enum value="0x3089" name="EGL_VG_COLORSPACE_sRGB"/> <enum value="0x3089" name="EGL_VG_COLORSPACE_sRGB"/>
<enum value="0x308A" name="EGL_COLORSPACE_LINEAR" alias="EGL_VG_COLORSPACE_LINEAR"/> <enum value="0x308A" name="EGL_COLORSPACE_LINEAR" alias="EGL_VG_COLORSPACE_LINEAR"/>
<enum value="0x308A" name="EGL_GL_COLORSPACE_LINEAR_KHR" alias="EGL_VG_COLORSPACE_LINEAR"/>
<enum value="0x308A" name="EGL_VG_COLORSPACE_LINEAR"/> <enum value="0x308A" name="EGL_VG_COLORSPACE_LINEAR"/>
<enum value="0x308B" name="EGL_ALPHA_FORMAT_NONPRE" alias="EGL_VG_ALPHA_FORMAT_NONPRE"/> <enum value="0x308B" name="EGL_ALPHA_FORMAT_NONPRE" alias="EGL_VG_ALPHA_FORMAT_NONPRE"/>
<enum value="0x308B" name="EGL_VG_ALPHA_FORMAT_NONPRE"/> <enum value="0x308B" name="EGL_VG_ALPHA_FORMAT_NONPRE"/>
@ -293,7 +296,8 @@
<enum value="0x309A" name="EGL_MULTISAMPLE_RESOLVE_DEFAULT"/> <enum value="0x309A" name="EGL_MULTISAMPLE_RESOLVE_DEFAULT"/>
<enum value="0x309B" name="EGL_MULTISAMPLE_RESOLVE_BOX"/> <enum value="0x309B" name="EGL_MULTISAMPLE_RESOLVE_BOX"/>
<enum value="0x309C" name="EGL_CL_EVENT_HANDLE_KHR"/> <enum value="0x309C" name="EGL_CL_EVENT_HANDLE_KHR"/>
<unused start="0x309D" end="0x309F"/> <enum value="0x309D" name="EGL_GL_COLORSPACE_KHR"/>
<unused start="0x309E" end="0x309F" comment="Placeholders for draft extensions follow"/>
<enum value="0x30A0" name="EGL_OPENGL_ES_API"/> <enum value="0x30A0" name="EGL_OPENGL_ES_API"/>
<enum value="0x30A1" name="EGL_OPENVG_API"/> <enum value="0x30A1" name="EGL_OPENVG_API"/>
<enum value="0x30A2" name="EGL_OPENGL_API"/> <enum value="0x30A2" name="EGL_OPENGL_API"/>
@ -462,7 +466,9 @@
<enum value="0x31D4" name="EGL_DRM_BUFFER_STRIDE_MESA"/> <enum value="0x31D4" name="EGL_DRM_BUFFER_STRIDE_MESA"/>
<enum value="0x31D5" name="EGL_PLATFORM_X11_EXT"/> <enum value="0x31D5" name="EGL_PLATFORM_X11_EXT"/>
<enum value="0x31D6" name="EGL_PLATFORM_X11_SCREEN_EXT"/> <enum value="0x31D6" name="EGL_PLATFORM_X11_SCREEN_EXT"/>
<unused start="0x31D5" end="0x31DF"/> <enum value="0x31D7" name="EGL_PLATFORM_GBM_MESA"/>
<enum value="0x31D8" name="EGL_PLATFORM_WAYLAND_EXT"/>
<unused start="0x31D9" end="0x31DF"/>
</enums> </enums>
<enums namespace="EGL" start="0x31E0" end="0x31EF" vendor="HI" comment="Reserved for Mark Callow (Khronos bug 6799)"> <enums namespace="EGL" start="0x31E0" end="0x31EF" vendor="HI" comment="Reserved for Mark Callow (Khronos bug 6799)">
@ -720,6 +726,12 @@
<param><ptype>EGLenum</ptype> <name>type</name></param> <param><ptype>EGLenum</ptype> <name>type</name></param>
<param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param> <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
</command> </command>
<command>
<proto><ptype>EGLSyncKHR</ptype> <name>eglCreateSync64KHR</name></proto>
<param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
<param><ptype>EGLenum</ptype> <name>type</name></param>
<param>const <ptype>EGLAttribKHR</ptype> *<name>attrib_list</name></param>
</command>
<command> <command>
<proto><ptype>EGLSurface</ptype> <name>eglCreateWindowSurface</name></proto> <proto><ptype>EGLSurface</ptype> <name>eglCreateWindowSurface</name></proto>
<param><ptype>EGLDisplay</ptype> <name>dpy</name></param> <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
@ -846,7 +858,7 @@
</command> </command>
<command> <command>
<proto><ptype>EGLBoolean</ptype> <name>eglLockSurfaceKHR</name></proto> <proto><ptype>EGLBoolean</ptype> <name>eglLockSurfaceKHR</name></proto>
<param><ptype>EGLDisplay</ptype> <name>display</name></param> <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
<param><ptype>EGLSurface</ptype> <name>surface</name></param> <param><ptype>EGLSurface</ptype> <name>surface</name></param>
<param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param> <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
</command> </command>
@ -926,6 +938,13 @@
<param><ptype>EGLint</ptype> <name>attribute</name></param> <param><ptype>EGLint</ptype> <name>attribute</name></param>
<param><ptype>EGLint</ptype> *<name>value</name></param> <param><ptype>EGLint</ptype> *<name>value</name></param>
</command> </command>
<command>
<proto><ptype>EGLBoolean</ptype> <name>eglQuerySurface64KHR</name></proto>
<param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
<param><ptype>EGLSurface</ptype> <name>surface</name></param>
<param><ptype>EGLint</ptype> <name>attribute</name></param>
<param><ptype>EGLAttribKHR</ptype> *<name>value</name></param>
</command>
<command> <command>
<proto><ptype>EGLBoolean</ptype> <name>eglQuerySurfacePointerANGLE</name></proto> <proto><ptype>EGLBoolean</ptype> <name>eglQuerySurfacePointerANGLE</name></proto>
<param><ptype>EGLDisplay</ptype> <name>dpy</name></param> <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
@ -1011,7 +1030,7 @@
</command> </command>
<command> <command>
<proto><ptype>EGLBoolean</ptype> <name>eglUnlockSurfaceKHR</name></proto> <proto><ptype>EGLBoolean</ptype> <name>eglUnlockSurfaceKHR</name></proto>
<param><ptype>EGLDisplay</ptype> <name>display</name></param> <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
<param><ptype>EGLSurface</ptype> <name>surface</name></param> <param><ptype>EGLSurface</ptype> <name>surface</name></param>
</command> </command>
<command> <command>
@ -1316,6 +1335,11 @@
<command name="eglCreatePlatformPixmapSurfaceEXT"/> <command name="eglCreatePlatformPixmapSurfaceEXT"/>
</require> </require>
</extension> </extension>
<extension name="EGL_EXT_platform_wayland" supported="egl">
<require>
<enum name="EGL_PLATFORM_WAYLAND_EXT"/>
</require>
</extension>
<extension name="EGL_EXT_platform_x11" supported="egl"> <extension name="EGL_EXT_platform_x11" supported="egl">
<require> <require>
<enum name="EGL_PLATFORM_X11_EXT"/> <enum name="EGL_PLATFORM_X11_EXT"/>
@ -1356,6 +1380,14 @@
<enum name="EGL_SYNC_CL_EVENT_COMPLETE_KHR"/> <enum name="EGL_SYNC_CL_EVENT_COMPLETE_KHR"/>
</require> </require>
</extension> </extension>
<extension name="EGL_KHR_cl_event2" supported="egl">
<require>
<enum name="EGL_CL_EVENT_HANDLE_KHR"/>
<enum name="EGL_SYNC_CL_EVENT_KHR"/>
<enum name="EGL_SYNC_CL_EVENT_COMPLETE_KHR"/>
<command name="eglCreateSync64KHR"/>
</require>
</extension>
<extension name="EGL_KHR_config_attribs" supported="egl"> <extension name="EGL_KHR_config_attribs" supported="egl">
<require> <require>
<enum name="EGL_CONFORMANT_KHR"/> <enum name="EGL_CONFORMANT_KHR"/>
@ -1363,6 +1395,10 @@
<enum name="EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR"/> <enum name="EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR"/>
</require> </require>
</extension> </extension>
<extension name="EGL_KHR_client_get_all_proc_addresses" supported="egl" comment="Alias of EGL_KHR_get_all_proc_addresses">
<require>
</require>
</extension>
<extension name="EGL_KHR_create_context" supported="egl"> <extension name="EGL_KHR_create_context" supported="egl">
<require> <require>
<enum name="EGL_CONTEXT_MAJOR_VERSION_KHR"/> <enum name="EGL_CONTEXT_MAJOR_VERSION_KHR"/>
@ -1392,6 +1428,13 @@
<require> <require>
</require> </require>
</extension> </extension>
<extension name="EGL_KHR_gl_colorspace" supported="egl">
<require>
<enum name="EGL_GL_COLORSPACE_KHR"/>
<enum name="EGL_GL_COLORSPACE_SRGB_KHR"/>
<enum name="EGL_GL_COLORSPACE_LINEAR_KHR"/>
</require>
</extension>
<extension name="EGL_KHR_gl_renderbuffer_image" supported="egl"> <extension name="EGL_KHR_gl_renderbuffer_image" supported="egl">
<require> <require>
<enum name="EGL_GL_RENDERBUFFER_KHR"/> <enum name="EGL_GL_RENDERBUFFER_KHR"/>
@ -1429,15 +1472,15 @@
</extension> </extension>
<extension name="EGL_KHR_image_base" supported="egl"> <extension name="EGL_KHR_image_base" supported="egl">
<require> <require>
<!-- @ Most interfaces defined by EGL_KHR_image above -->
<enum name="EGL_IMAGE_PRESERVED_KHR"/> <enum name="EGL_IMAGE_PRESERVED_KHR"/>
<enum name="EGL_NO_IMAGE_KHR"/>
<command name="eglCreateImageKHR"/> <command name="eglCreateImageKHR"/>
<command name="eglDestroyImageKHR"/> <command name="eglDestroyImageKHR"/>
</require> </require>
</extension> </extension>
<extension name="EGL_KHR_image_pixmap" supported="egl"> <extension name="EGL_KHR_image_pixmap" supported="egl">
<require> <require>
<!-- @ Most interfaces defined by EGL_KHR_image above --> <enum name="EGL_NATIVE_PIXMAP_KHR"/>
</require> </require>
</extension> </extension>
<extension name="EGL_KHR_lock_surface" supported="egl"> <extension name="EGL_KHR_lock_surface" supported="egl">
@ -1472,6 +1515,35 @@
<enum name="EGL_BITMAP_PIXEL_SIZE_KHR"/> <enum name="EGL_BITMAP_PIXEL_SIZE_KHR"/>
</require> </require>
</extension> </extension>
<extension name="EGL_KHR_lock_surface3" supported="egl">
<require>
<enum name="EGL_READ_SURFACE_BIT_KHR"/>
<enum name="EGL_WRITE_SURFACE_BIT_KHR"/>
<enum name="EGL_LOCK_SURFACE_BIT_KHR"/>
<enum name="EGL_OPTIMAL_FORMAT_BIT_KHR"/>
<enum name="EGL_MATCH_FORMAT_KHR"/>
<enum name="EGL_FORMAT_RGB_565_EXACT_KHR"/>
<enum name="EGL_FORMAT_RGB_565_KHR"/>
<enum name="EGL_FORMAT_RGBA_8888_EXACT_KHR"/>
<enum name="EGL_FORMAT_RGBA_8888_KHR"/>
<enum name="EGL_MAP_PRESERVE_PIXELS_KHR"/>
<enum name="EGL_LOCK_USAGE_HINT_KHR"/>
<enum name="EGL_BITMAP_PITCH_KHR"/>
<enum name="EGL_BITMAP_ORIGIN_KHR"/>
<enum name="EGL_BITMAP_PIXEL_RED_OFFSET_KHR"/>
<enum name="EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR"/>
<enum name="EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR"/>
<enum name="EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR"/>
<enum name="EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR"/>
<enum name="EGL_BITMAP_PIXEL_SIZE_KHR"/>
<enum name="EGL_BITMAP_POINTER_KHR"/>
<enum name="EGL_LOWER_LEFT_KHR"/>
<enum name="EGL_UPPER_LEFT_KHR"/>
<command name="eglLockSurfaceKHR"/>
<command name="eglUnlockSurfaceKHR"/>
<command name="eglQuerySurface64KHR"/>
</require>
</extension>
<extension name="EGL_KHR_reusable_sync" protect="KHRONOS_SUPPORT_INT64" supported="egl"> <extension name="EGL_KHR_reusable_sync" protect="KHRONOS_SUPPORT_INT64" supported="egl">
<require> <require>
<enum name="EGL_SYNC_STATUS_KHR"/> <enum name="EGL_SYNC_STATUS_KHR"/>
@ -1575,6 +1647,11 @@
<command name="eglExportDRMImageMESA"/> <command name="eglExportDRMImageMESA"/>
</require> </require>
</extension> </extension>
<extension name="EGL_MESA_platform_gbm" supported="egl">
<require>
<enum name="EGL_PLATFORM_GBM_MESA"/>
</require>
</extension>
<extension name="EGL_NV_3dvision_surface" supported="egl"> <extension name="EGL_NV_3dvision_surface" supported="egl">
<require> <require>
<enum name="EGL_AUTO_STEREO_NV"/> <enum name="EGL_AUTO_STEREO_NV"/>

1208
registry/gl.xml
View File

File diff suppressed because it is too large Load Diff

13
registry/glx.xml
Unescape View File

@ -86,6 +86,7 @@ typedef unsigned __int64 uint64_t;
<type name="XVisualInfo"/> <type name="XVisualInfo"/>
<type name="GLboolean"/> <type name="GLboolean"/>
<type name="GLenum"/> <type name="GLenum"/>
<type name="GLfloat"/>
<type name="GLint"/> <type name="GLint"/>
<type name="GLsizei"/> <type name="GLsizei"/>
<type name="GLubyte"/> <type name="GLubyte"/>
@ -818,6 +819,12 @@ typedef unsigned __int64 uint64_t;
<param><ptype>Window</ptype> <name>window</name></param> <param><ptype>Window</ptype> <name>window</name></param>
<param>float <name>cushion</name></param> <param>float <name>cushion</name></param>
</command> </command>
<command>
<proto><ptype>Bool</ptype> <name>glXDelayBeforeSwapNV</name></proto>
<param><ptype>Display</ptype> *<name>dpy</name></param>
<param><ptype>GLXDrawable</ptype> <name>drawable</name></param>
<param><ptype>GLfloat</ptype> <name>seconds</name></param>
</command>
<command> <command>
<proto>void <name>glXDestroyContext</name></proto> <proto>void <name>glXDestroyContext</name></proto>
<param><ptype>Display</ptype> *<name>dpy</name></param> <param><ptype>Display</ptype> *<name>dpy</name></param>
@ -1399,6 +1406,7 @@ typedef unsigned __int64 uint64_t;
<feature api="glx" name="GLX_VERSION_1_3" number="1.3"> <feature api="glx" name="GLX_VERSION_1_3" number="1.3">
<require> <require>
<type name="GLXContextID" comment="Required here so it doesn't collide with Mesa glx.h (Bug 11454)"/>
<enum name="GLX_WINDOW_BIT"/> <enum name="GLX_WINDOW_BIT"/>
<enum name="GLX_PIXMAP_BIT"/> <enum name="GLX_PIXMAP_BIT"/>
<enum name="GLX_PBUFFER_BIT"/> <enum name="GLX_PBUFFER_BIT"/>
@ -1778,6 +1786,11 @@ typedef unsigned __int64 uint64_t;
<command name="glXWaitForSbcOML"/> <command name="glXWaitForSbcOML"/>
</require> </require>
</extension> </extension>
<extension name="GLX_NV_delay_before_swap" supported="glx">
<require>
<command name="glXDelayBeforeSwapNV"/>
</require>
</extension>
<extension name="GLX_NV_float_buffer" supported="glx"> <extension name="GLX_NV_float_buffer" supported="glx">
<require> <require>
<enum name="GLX_FLOAT_COMPONENTS_NV"/> <enum name="GLX_FLOAT_COMPONENTS_NV"/>

Write Preview
Loading…
Cancel
Save