Merge branch 'khronos-registry'

macos/v1.5.9
Eric Anholt 11 years ago
commit 79600fa6d2
  1. 16
      registry/egl.xml
  2. 45
      registry/gl.xml

@ -568,6 +568,11 @@
<unused start="0x32B0" end="0x32BF"/>
</enums>
<enums namespace="EGL" start="0x32C0" end="0x32CF" vendor="Vivante" comment="Reserved for Jeff Vigil (Bug 10663)">
<enum value="0x32C0" name="EGL_PROTECTED_CONTENT_EXT"/>
<unused start="0x32C1" end="0x32CF"/>
</enums>
<!-- Please remember that new enumerant allocations must be obtained by
request to the Khronos API registrar (see comments at the top of this
file) File requests in the Khronos Bugzilla, EGL project, Registry
@ -575,11 +580,11 @@
Khronos APIs, and new ranges should be allocated with such overlaps in
mind. -->
<!-- Reservable for future use: 0x32C0-0x3FFF.
<!-- Reservable for future use: 0x32D0-0x3FFF.
To generate a new range, allocate multiples of 16 starting at the
lowest available point in this block. -->
<enums namespace="EGL" start="0x32C0" end="0x3FFF" vendor="KHR">
<unused start="0x32C0" end="0x3FFF" comment="Reserved for future use"/>
<enums namespace="EGL" start="0x32D0" end="0x3FFF" vendor="KHR">
<unused start="0x32D0" end="0x3FFF" comment="Reserved for future use"/>
</enums>
<enums namespace="EGL" start="0x8F70" end="0x8F7F" vendor="HI" comment="For Mark Callow, Khronos bug 4055. Shared with GL.">
@ -1346,6 +1351,11 @@
<enum name="EGL_PLATFORM_X11_SCREEN_EXT"/>
</require>
</extension>
<extension name="EGL_EXT_protected_surface" supported="egl">
<require>
<enum name="EGL_PROTECTED_CONTENT_EXT"/>
</require>
</extension>
<extension name="EGL_EXT_swap_buffers_with_damage" supported="egl">
<require>
<command name="eglSwapBuffersWithDamageEXT"/>

@ -7236,7 +7236,11 @@ typedef unsigned int GLhandleARB;
<unused start="0x903D" end="0x9044"/>
<enum value="0x9045" name="GL_TEXTURE_COVERAGE_SAMPLES_NV"/>
<enum value="0x9046" name="GL_TEXTURE_COLOR_SAMPLES_NV"/>
<unused start="0x9047" end="0x904B"/>
<enum value="0x9047" name="GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX"/>
<enum value="0x9048" name="GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX"/>
<enum value="0x9049" name="GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX"/>
<enum value="0x904A" name="GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX"/>
<enum value="0x904B" name="GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX"/>
<enum value="0x904C" name="GL_IMAGE_1D"/>
<enum value="0x904C" name="GL_IMAGE_1D_EXT"/>
<enum value="0x904D" name="GL_IMAGE_2D"/>
@ -7870,22 +7874,22 @@ typedef unsigned int GLhandleARB;
</enums>
<enums namespace="GL" start="0x94F0" end="0x950F" vendor="INTEL" comment="Khronos bug 11345">
<enum value="0x94F0" name="GL_PERFQUERY_COUNTER_EVENT_INTEL"/>
<enum value="0x94F1" name="GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL"/>
<enum value="0x94F2" name="GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL"/>
<enum value="0x94F3" name="GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL"/>
<enum value="0x94F4" name="GL_PERFQUERY_COUNTER_RAW_INTEL"/>
<enum value="0x94F5" name="GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL"/>
<enum value="0x94F0" name="GL_PERFQUERY_COUNTER_EVENT_INTEL"/>
<enum value="0x94F1" name="GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL"/>
<enum value="0x94F2" name="GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL"/>
<enum value="0x94F3" name="GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL"/>
<enum value="0x94F4" name="GL_PERFQUERY_COUNTER_RAW_INTEL"/>
<enum value="0x94F5" name="GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL"/>
<unused start="0x94F6" end="0x94F7"/>
<enum value="0x94F8" name="GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL"/>
<enum value="0x94F9" name="GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL"/>
<enum value="0x94FA" name="GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL"/>
<enum value="0x94FB" name="GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL"/>
<enum value="0x94FC" name="GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL"/>
<enum value="0x94FD" name="GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL"/>
<enum value="0x94FE" name="GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL"/>
<enum value="0x94FF" name="GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL"/>
<enum value="0x9500" name="GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL"/>
<enum value="0x94F8" name="GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL"/>
<enum value="0x94F9" name="GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL"/>
<enum value="0x94FA" name="GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL"/>
<enum value="0x94FB" name="GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL"/>
<enum value="0x94FC" name="GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL"/>
<enum value="0x94FD" name="GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL"/>
<enum value="0x94FE" name="GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL"/>
<enum value="0x94FF" name="GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL"/>
<enum value="0x9500" name="GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL"/>
<unused start="0x9501" end="0x950F"/>
</enums>
@ -38286,6 +38290,15 @@ typedef unsigned int GLhandleARB;
<command name="glEndConditionalRenderNVX"/>
</require>
</extension>
<extension name="GL_NVX_gpu_memory_info" supported="gl">
<require>
<enum name="GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX"/>
<enum name="GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX"/>
<enum name="GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX"/>
<enum name="GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX"/>
<enum name="GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX"/>
</require>
</extension>
<extension name="GL_NV_bindless_multi_draw_indirect" supported="gl">
<require>
<command name="glMultiDrawArraysIndirectBindlessNV"/>

Loading…
Cancel
Save