summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Noblesmith <nobled@dreamwidth.org>2012-01-17 02:12:19 +0000
committerDylan Noblesmith <nobled@dreamwidth.org>2012-03-26 21:35:17 +0000
commit91c8bedb8a546c922835f119ba330faa4e2e4fc9 (patch)
tree8ee18061898621ae1a64a7b47f48a69aed7c3945
parent50fa8218548581e054479e872fc4348a60ab0b86 (diff)
glapi: add GL_ARB_texture_float
And add some missing core GL 3.0 enums that came from this extension, too. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/mapi/glapi/gen/ARB_texture_float.xml36
-rw-r--r--src/mapi/glapi/gen/GL3x.xml7
-rw-r--r--src/mapi/glapi/gen/Makefile1
-rw-r--r--src/mapi/glapi/gen/gl_API.xml4
4 files changed, 47 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_texture_float.xml b/src/mapi/glapi/gen/ARB_texture_float.xml
new file mode 100644
index 00000000000..5db7691c8d7
--- /dev/null
+++ b/src/mapi/glapi/gen/ARB_texture_float.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_texture_float" number="41">
+
+ <enum name="TEXTURE_RED_TYPE_ARB" value="0x8C10"/>
+ <enum name="TEXTURE_GREEN_TYPE_ARB" value="0x8C11"/>
+ <enum name="TEXTURE_BLUE_TYPE_ARB" value="0x8C12"/>
+ <enum name="TEXTURE_ALPHA_TYPE_ARB" value="0x8C13"/>
+ <enum name="TEXTURE_LUMINANCE_TYPE_ARB" value="0x8C14"/>
+ <enum name="TEXTURE_INTENSITY_TYPE_ARB" value="0x8C15"/>
+ <enum name="TEXTURE_DEPTH_TYPE_ARB" value="0x8C16"/>
+
+ <!-- The unsuffixed version of this is in ARB_framebuffer_object.xml -->
+ <enum name="UNSIGNED_NORMALIZED_ARB" value="0x8C17"/>
+
+ <!-- Note only the RGBA/RGB formats have unsuffixed core GL equivalents,
+ since LUMINANCE/INTENSITY/ALPHA formats were deprecated. -->
+ <enum name="RGBA32F_ARB" value="0x8814"/>
+ <enum name="RGB32F_ARB" value="0x8815"/>
+ <enum name="ALPHA32F_ARB" value="0x8816"/>
+ <enum name="INTENSITY32F_ARB" value="0x8817"/>
+ <enum name="LUMINANCE32F_ARB" value="0x8818"/>
+ <enum name="LUMINANCE_ALPHA32F_ARB" value="0x8819"/>
+ <enum name="RGBA16F_ARB" value="0x881A"/>
+ <enum name="RGB16F_ARB" value="0x881B"/>
+ <enum name="ALPHA16F_ARB" value="0x881C"/>
+ <enum name="INTENSITY16F_ARB" value="0x881D"/>
+ <enum name="LUMINANCE16F_ARB" value="0x881E"/>
+ <enum name="LUMINANCE_ALPHA16F_ARB" value="0x881F"/>
+
+</category>
+
+</OpenGLAPI>
diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml
index f74e36007fd..86a9a2c3d0b 100644
--- a/src/mapi/glapi/gen/GL3x.xml
+++ b/src/mapi/glapi/gen/GL3x.xml
@@ -35,6 +35,13 @@
<enum name="CLAMP_READ_COLOR" value="0x891C"/>
<enum name="FIXED_ONLY" value="0x891D"/>
<enum name="MAX_VARYING_COMPONENTS" value="0x8B4B"/>
+ <enum name="TEXTURE_RED_TYPE" value="0x8C10"/>
+ <enum name="TEXTURE_GREEN_TYPE" value="0x8C11"/>
+ <enum name="TEXTURE_BLUE_TYPE" value="0x8C12"/>
+ <enum name="TEXTURE_ALPHA_TYPE" value="0x8C13"/>
+ <enum name="TEXTURE_LUMINANCE_TYPE" value="0x8C14"/>
+ <enum name="TEXTURE_INTENSITY_TYPE" value="0x8C15"/>
+ <enum name="TEXTURE_DEPTH_TYPE" value="0x8C16"/>
<enum name="TEXTURE_1D_ARRAY" value="0x8C18"/>
<enum name="PROXY_TEXTURE_1D_ARRAY" value="0x8C19"/>
<enum name="TEXTURE_2D_ARRAY" value="0x8C1A"/>
diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile
index 244c67ecc03..49dfd75bfb7 100644
--- a/src/mapi/glapi/gen/Makefile
+++ b/src/mapi/glapi/gen/Makefile
@@ -82,6 +82,7 @@ API_XML = \
ARB_sync.xml \
ARB_texture_buffer_object.xml \
ARB_texture_compression_rgtc.xml \
+ ARB_texture_float.xml \
ARB_texture_rg.xml \
ARB_texture_storage.xml \
ARB_vertex_array_object.xml \
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 77b47b76353..a74577d1fc3 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -7896,7 +7896,9 @@
<xi:include href="ARB_color_buffer_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- 40. GL_ARB_half_float_pixel -->
-<!-- 41. GL_ARB_texture_float -->
+
+<xi:include href="ARB_texture_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
<!-- 42. GL_ARB_pixel_buffer_object -->
<xi:include href="ARB_depth_buffer_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>