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

Merge branch 'khronos-registry'

Browse Source 
This brings in support for non-error context extensions.
macos/v1.5.9
Eric Anholt 9 years ago
parent a7c270f8e2 5987e1ef1a
commit 8154c0efd3
2 changed files with 75 additions and 9 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. 8
      registry/egl.xml
  2. 76
      registry/gl.xml

8
registry/egl.xml
Unescape View File

@ -499,7 +499,8 @@
<enum value="0x31B0" name="EGL_CONTEXT_OPENGL_DEBUG"/> <enum value="0x31B0" name="EGL_CONTEXT_OPENGL_DEBUG"/>
<enum value="0x31B1" name="EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE"/> <enum value="0x31B1" name="EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE"/>
<enum value="0x31B2" name="EGL_CONTEXT_OPENGL_ROBUST_ACCESS"/> <enum value="0x31B2" name="EGL_CONTEXT_OPENGL_ROBUST_ACCESS"/>
<unused start="0x31B3" end="0x31BC" comment="Formerly reserved for EGL_image_stream"/> <enum value="0x31B3" name="EGL_CONTEXT_OPENGL_NO_ERROR_KHR"/>
<unused start="0x31B4" end="0x31BC" comment="0x31B3-0x31BC formerly reserved for EGL_image_stream"/>
<enum value="0x31BD" name="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR" alias="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY"/> <enum value="0x31BD" name="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR" alias="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY"/>
<enum value="0x31BD" name="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY"/> <enum value="0x31BD" name="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY"/>
<enum value="0x31BE" name="EGL_NO_RESET_NOTIFICATION"/> <enum value="0x31BE" name="EGL_NO_RESET_NOTIFICATION"/>
@ -1963,6 +1964,11 @@
<enum name="EGL_OPENGL_ES3_BIT_KHR"/> <enum name="EGL_OPENGL_ES3_BIT_KHR"/>
</require> </require>
</extension> </extension>
<extension name="EGL_KHR_create_context_no_error" supported="egl">
<require>
<enum name="EGL_CONTEXT_OPENGL_NO_ERROR_KHR"/>
</require>
</extension>
<extension name="EGL_KHR_fence_sync" protect="KHRONOS_SUPPORT_INT64" supported="egl"> <extension name="EGL_KHR_fence_sync" protect="KHRONOS_SUPPORT_INT64" supported="egl">
<require> <require>
<!-- Most interfaces also defined by EGL_KHR_reusable sync --> <!-- Most interfaces also defined by EGL_KHR_reusable sync -->

76
registry/gl.xml
Unescape View File

@ -2060,6 +2060,7 @@ typedef unsigned int GLhandleARB;
<enum value="0x00000002" name="GL_CONTEXT_FLAG_DEBUG_BIT_KHR"/> <enum value="0x00000002" name="GL_CONTEXT_FLAG_DEBUG_BIT_KHR"/>
<enum value="0x00000004" name="GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB"/> <enum value="0x00000004" name="GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB"/>
<enum value="0x00000004" name="GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT"/> <enum value="0x00000004" name="GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT"/>
<enum value="0x00000008" name="GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR"/>
</enums> </enums>
<enums namespace="GL" group="ContextProfileMask" type="bitmask"> <enums namespace="GL" group="ContextProfileMask" type="bitmask">
@ -4059,6 +4060,7 @@ typedef unsigned int GLhandleARB;
<enums namespace="GL" start="0x82B0" end="0x830F" vendor="ARB" comment="Range reclaimed from ADD on 2012/05/10"> <enums namespace="GL" start="0x82B0" end="0x830F" vendor="ARB" comment="Range reclaimed from ADD on 2012/05/10">
<unused start="0x82B0" vendor="ARB"/> <unused start="0x82B0" vendor="ARB"/>
<!-- future: <enum value="0x82B0" name="GL_MULTISAMPLE_LINE_WIDTH_RANGE"/> -->
<enum value="0x82B1" name="GL_TEXTURE_COMPRESSED_BLOCK_WIDTH"/> <enum value="0x82B1" name="GL_TEXTURE_COMPRESSED_BLOCK_WIDTH"/>
<enum value="0x82B2" name="GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT"/> <enum value="0x82B2" name="GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT"/>
<enum value="0x82B3" name="GL_TEXTURE_COMPRESSED_BLOCK_SIZE"/> <enum value="0x82B3" name="GL_TEXTURE_COMPRESSED_BLOCK_SIZE"/>
@ -6770,7 +6772,22 @@ typedef unsigned int GLhandleARB;
<enum value="0x8CEF" name="GL_COLOR_ATTACHMENT15"/> <enum value="0x8CEF" name="GL_COLOR_ATTACHMENT15"/>
<enum value="0x8CEF" name="GL_COLOR_ATTACHMENT15_EXT"/> <enum value="0x8CEF" name="GL_COLOR_ATTACHMENT15_EXT"/>
<enum value="0x8CEF" name="GL_COLOR_ATTACHMENT15_NV"/> <enum value="0x8CEF" name="GL_COLOR_ATTACHMENT15_NV"/>
<unused start="0x8CF0" end="0x8CFF" vendor="ARB" comment="For color attachments 16-31"/> <enum value="0x8CF0" name="GL_COLOR_ATTACHMENT16"/>
<enum value="0x8CF1" name="GL_COLOR_ATTACHMENT17"/>
<enum value="0x8CF2" name="GL_COLOR_ATTACHMENT18"/>
<enum value="0x8CF3" name="GL_COLOR_ATTACHMENT19"/>
<enum value="0x8CF4" name="GL_COLOR_ATTACHMENT20"/>
<enum value="0x8CF5" name="GL_COLOR_ATTACHMENT21"/>
<enum value="0x8CF6" name="GL_COLOR_ATTACHMENT22"/>
<enum value="0x8CF7" name="GL_COLOR_ATTACHMENT23"/>
<enum value="0x8CF8" name="GL_COLOR_ATTACHMENT24"/>
<enum value="0x8CF9" name="GL_COLOR_ATTACHMENT25"/>
<enum value="0x8CFA" name="GL_COLOR_ATTACHMENT26"/>
<enum value="0x8CFB" name="GL_COLOR_ATTACHMENT27"/>
<enum value="0x8CFC" name="GL_COLOR_ATTACHMENT28"/>
<enum value="0x8CFD" name="GL_COLOR_ATTACHMENT29"/>
<enum value="0x8CFE" name="GL_COLOR_ATTACHMENT30"/>
<enum value="0x8CFF" name="GL_COLOR_ATTACHMENT31"/>
<enum value="0x8D00" name="GL_DEPTH_ATTACHMENT"/> <enum value="0x8D00" name="GL_DEPTH_ATTACHMENT"/>
<enum value="0x8D00" name="GL_DEPTH_ATTACHMENT_EXT"/> <enum value="0x8D00" name="GL_DEPTH_ATTACHMENT_EXT"/>
<enum value="0x8D00" name="GL_DEPTH_ATTACHMENT_OES"/> <enum value="0x8D00" name="GL_DEPTH_ATTACHMENT_OES"/>
@ -8376,6 +8393,12 @@ typedef unsigned int GLhandleARB;
<unused start="0x9633" end="0x963F" vendor="Oculus"/> <unused start="0x9633" end="0x963F" vendor="Oculus"/>
</enums> </enums>
<enums namespace="GL" start="0x9640" end="0x964F" vendor="Mediatek" comment="Khronos bug 14294">
<enum value="0x9640" name="GL_GS_SHADER_BINARY_MTK"/>
<enum value="0x9641" name="GL_GS_PROGRAM_BINARY_MTK"/>
<unused start="0x9642" end="0x964F" vendor="Mediatek"/>
</enums>
<!-- Enums reservable for future use. To reserve a new range, allocate one <!-- Enums reservable for future use. To reserve a new range, allocate one
or more multiples of 16 starting at the lowest available point in this or more multiples of 16 starting at the lowest available point in this
block and note it in a new <enums> block immediately above. block and note it in a new <enums> block immediately above.
@ -31058,6 +31081,22 @@ typedef unsigned int GLhandleARB;
<enum name="GL_COLOR_ATTACHMENT13"/> <enum name="GL_COLOR_ATTACHMENT13"/>
<enum name="GL_COLOR_ATTACHMENT14"/> <enum name="GL_COLOR_ATTACHMENT14"/>
<enum name="GL_COLOR_ATTACHMENT15"/> <enum name="GL_COLOR_ATTACHMENT15"/>
<enum name="GL_COLOR_ATTACHMENT16"/>
<enum name="GL_COLOR_ATTACHMENT17"/>
<enum name="GL_COLOR_ATTACHMENT18"/>
<enum name="GL_COLOR_ATTACHMENT19"/>
<enum name="GL_COLOR_ATTACHMENT20"/>
<enum name="GL_COLOR_ATTACHMENT21"/>
<enum name="GL_COLOR_ATTACHMENT22"/>
<enum name="GL_COLOR_ATTACHMENT23"/>
<enum name="GL_COLOR_ATTACHMENT24"/>
<enum name="GL_COLOR_ATTACHMENT25"/>
<enum name="GL_COLOR_ATTACHMENT26"/>
<enum name="GL_COLOR_ATTACHMENT27"/>
<enum name="GL_COLOR_ATTACHMENT28"/>
<enum name="GL_COLOR_ATTACHMENT29"/>
<enum name="GL_COLOR_ATTACHMENT30"/>
<enum name="GL_COLOR_ATTACHMENT31"/>
<enum name="GL_DEPTH_ATTACHMENT"/> <enum name="GL_DEPTH_ATTACHMENT"/>
<enum name="GL_STENCIL_ATTACHMENT"/> <enum name="GL_STENCIL_ATTACHMENT"/>
<enum name="GL_FRAMEBUFFER"/> <enum name="GL_FRAMEBUFFER"/>
@ -34526,6 +34565,22 @@ typedef unsigned int GLhandleARB;
<enum name="GL_COLOR_ATTACHMENT13"/> <enum name="GL_COLOR_ATTACHMENT13"/>
<enum name="GL_COLOR_ATTACHMENT14"/> <enum name="GL_COLOR_ATTACHMENT14"/>
<enum name="GL_COLOR_ATTACHMENT15"/> <enum name="GL_COLOR_ATTACHMENT15"/>
<enum name="GL_COLOR_ATTACHMENT16"/>
<enum name="GL_COLOR_ATTACHMENT17"/>
<enum name="GL_COLOR_ATTACHMENT18"/>
<enum name="GL_COLOR_ATTACHMENT19"/>
<enum name="GL_COLOR_ATTACHMENT20"/>
<enum name="GL_COLOR_ATTACHMENT21"/>
<enum name="GL_COLOR_ATTACHMENT22"/>
<enum name="GL_COLOR_ATTACHMENT23"/>
<enum name="GL_COLOR_ATTACHMENT24"/>
<enum name="GL_COLOR_ATTACHMENT25"/>
<enum name="GL_COLOR_ATTACHMENT26"/>
<enum name="GL_COLOR_ATTACHMENT27"/>
<enum name="GL_COLOR_ATTACHMENT28"/>
<enum name="GL_COLOR_ATTACHMENT29"/>
<enum name="GL_COLOR_ATTACHMENT30"/>
<enum name="GL_COLOR_ATTACHMENT31"/>
<enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE"/> <enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE"/>
<enum name="GL_MAX_SAMPLES"/> <enum name="GL_MAX_SAMPLES"/>
<enum name="GL_HALF_FLOAT"/> <enum name="GL_HALF_FLOAT"/>
@ -38857,13 +38912,13 @@ typedef unsigned int GLhandleARB;
<require> <require>
<enum name="GL_MAP_READ_BIT"/> <enum name="GL_MAP_READ_BIT"/>
<enum name="GL_MAP_WRITE_BIT"/> <enum name="GL_MAP_WRITE_BIT"/>
<enum name="GL_MAP_PERSISTENT_BIT"/> <enum name="GL_MAP_PERSISTENT_BIT_EXT"/>
<enum name="GL_MAP_COHERENT_BIT"/> <enum name="GL_MAP_COHERENT_BIT_EXT"/>
<enum name="GL_DYNAMIC_STORAGE_BIT"/> <enum name="GL_DYNAMIC_STORAGE_BIT_EXT"/>
<enum name="GL_CLIENT_STORAGE_BIT"/> <enum name="GL_CLIENT_STORAGE_BIT_EXT"/>
<enum name="GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT"/> <enum name="GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT_EXT"/>
<enum name="GL_BUFFER_IMMUTABLE_STORAGE"/> <enum name="GL_BUFFER_IMMUTABLE_STORAGE_EXT"/>
<enum name="GL_BUFFER_STORAGE_FLAGS"/> <enum name="GL_BUFFER_STORAGE_FLAGS_EXT"/>
<command name="glBufferStorageEXT"/> <command name="glBufferStorageEXT"/>
<!-- <command name="glNamedBufferStorageEXT"/> --> <!-- <command name="glNamedBufferStorageEXT"/> -->
</require> </require>
@ -41598,6 +41653,11 @@ typedef unsigned int GLhandleARB;
<enum name="GL_DISPLAY_LIST"/> <enum name="GL_DISPLAY_LIST"/>
</require> </require>
</extension> </extension>
<extension name="GL_KHR_no_error" supported="gl|glcore|gles2">
<require>
<enum name="GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR"/>
</require>
</extension>
<extension name="GL_KHR_robust_buffer_access_behavior" supported="gl|glcore|gles2"/> <extension name="GL_KHR_robust_buffer_access_behavior" supported="gl|glcore|gles2"/>
<extension name="GL_KHR_robustness" supported="gl|glcore|gles2"> <extension name="GL_KHR_robustness" supported="gl|glcore|gles2">
<require api="gl" comment="KHR extensions *mandate* suffixes for ES, unlike for GL"> <require api="gl" comment="KHR extensions *mandate* suffixes for ES, unlike for GL">

Write Preview
Loading…
Cancel
Save