Module: Mesa Branch: master Commit: bae4cd6882fd69f3beac6d5c8dd33efb5b4ea777 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bae4cd6882fd69f3beac6d5c8dd33efb5b4ea777
Author: Dylan Noblesmith <[email protected]> Date: Mon Jan 16 21:41:54 2012 +0000 glapi: add ARB_texture_rg Noticed it was missing based on the lack of a descriptive enum name from this bug's error message: https://bugs.freedesktop.org/show_bug.cgi?id=44039 This moves two enums out of GL3x.xml. Though since this and GL_ARB_texture_compression_rgtc are both strict subsets of GL3, both extensions should have had all their enums in that file to begin with, not just two of them. Reviewed-by: Brian Paul <[email protected]> --- src/mapi/glapi/gen/ARB_texture_rg.xml | 42 +++++++++++++++++++++++++++++++++ src/mapi/glapi/gen/GL3x.xml | 2 - src/mapi/glapi/gen/Makefile | 1 + src/mapi/glapi/gen/gl_API.xml | 3 +- 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/mapi/glapi/gen/ARB_texture_rg.xml b/src/mapi/glapi/gen/ARB_texture_rg.xml new file mode 100644 index 0000000..40c0ebf --- /dev/null +++ b/src/mapi/glapi/gen/ARB_texture_rg.xml @@ -0,0 +1,42 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<OpenGLAPI> + +<category name="GL_ARB_texture_rg" number="53"> + + <enum name="COMPRESSED_RED" value = "0x8225"/> + <enum name="COMPRESSED_RG" value = "0x8226"/> + + <enum name="RG" value = "0x8227"/> + <enum name="RG_INTEGER" value = "0x8228"/> + + <enum name="R8" value = "0x8229"/> + <enum name="R16" value = "0x822A"/> + + <enum name="RG8" value = "0x822B"/> + <enum name="RG16" value = "0x822C"/> + + <enum name="R16F" value = "0x822D"/> + <enum name="R32F" value = "0x822E"/> + + <enum name="RG16F" value = "0x822F"/> + <enum name="RG32F" value = "0x8230"/> + + <enum name="R8I" value = "0x8231"/> + <enum name="R8UI" value = "0x8232"/> + <enum name="R16I" value = "0x8233"/> + <enum name="R16UI" value = "0x8234"/> + <enum name="R32I" value = "0x8235"/> + <enum name="R32UI" value = "0x8236"/> + + <enum name="RG8I" value = "0x8237"/> + <enum name="RG8UI" value = "0x8238"/> + <enum name="RG16I" value = "0x8239"/> + <enum name="RG16UI" value = "0x823A"/> + <enum name="RG32I" value = "0x823B"/> + <enum name="RG32UI" value = "0x823C"/> + +</category> + +</OpenGLAPI> diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml index cec9c91..f74e360 100644 --- a/src/mapi/glapi/gen/GL3x.xml +++ b/src/mapi/glapi/gen/GL3x.xml @@ -23,8 +23,6 @@ <enum name="CONTEXT_FLAGS" value="0x821E"/> <enum name="DEPTH_BUFFER" value="0x8223"/> <enum name="STENCIL_BUFFER" value="0x8224"/> - <enum name="COMPRESSED_RED" value="0x8225"/> - <enum name="COMPRESSED_RG" value="0x8226"/> <enum name="CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT" value="0x0001"/> <enum name="RGBA32F" value="0x8814"/> <enum name="RGB32F" value="0x8815"/> diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile index 44939e3..3e054d7 100644 --- a/src/mapi/glapi/gen/Makefile +++ b/src/mapi/glapi/gen/Makefile @@ -80,6 +80,7 @@ API_XML = \ ARB_seamless_cube_map.xml \ ARB_sync.xml \ ARB_texture_buffer_object.xml \ + ARB_texture_rg.xml \ ARB_texture_storage.xml \ ARB_vertex_array_object.xml \ AMD_draw_buffers_blend.xml \ diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 9e7c7c2..2da4116 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -7917,7 +7917,8 @@ <xi:include href="ARB_texture_buffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <!-- 52. GL_ARB_texture_compression_rgtc --> -<!-- 53. GL_ARB_texture_rg --> + +<xi:include href="ARB_texture_rg.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="ARB_vertex_array_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
