diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-04-09 10:14:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-04-09 10:31:08 +1000 |
| commit | d1a9b1f513109c975a5a7ed5a2d0c329b280afe4 (patch) | |
| tree | 5c85af47b4f5af0661acf129e3ce3f59e43cbfd9 /src/mesa/glapi | |
| parent | 90ffce497395d8c02fee2ea4ee4c025eede3d876 (diff) | |
| parent | 8648c2685870174cf620ef15de70ef030a8d5a20 (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r200/r200_tex.c
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/radeon/radeon_tex.c
Diffstat (limited to 'src/mesa/glapi')
| -rw-r--r-- | src/mesa/glapi/gl_API.xml | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml index cc3e3ae6bf..4b66793e1c 100644 --- a/src/mesa/glapi/gl_API.xml +++ b/src/mesa/glapi/gl_API.xml @@ -5039,7 +5039,7 @@ <type name="char" size="1" glx_name="CARD8"/> - <enum name="GL_BLEND_EQUATION_RGB" value="0x8009"/> + <enum name="BLEND_EQUATION_RGB" value="0x8009"/> <enum name="VERTEX_ATTRIB_ARRAY_ENABLED" value="0x8622"/> <enum name="VERTEX_ATTRIB_ARRAY_SIZE" value="0x8623"/> <enum name="VERTEX_ATTRIB_ARRAY_STRIDE" value="0x8624"/> @@ -5684,29 +5684,29 @@ <!-- XXX some of the enums and functions probably need additional --> <!-- flags/attributes. --> - <enum name="GL_CURRENT_RASTER_SECONDARY_COLOR" value="0x845F"/> - <enum name="GL_PIXEL_PACK_BUFFER" value="0x88EB"/> - <enum name="GL_PIXEL_UNPACK_BUFFER" value="0x88EC"/> - <enum name="GL_PIXEL_PACK_BUFFER_BINDING" value="0x88ED"/> - <enum name="GL_PIXEL_UNPACK_BUFFER_BINDING" value="0x88EF"/> - <enum name="GL_FLOAT_MAT2x3" value="0x8B65"/> - <enum name="GL_FLOAT_MAT2x4" value="0x8B66"/> - <enum name="GL_FLOAT_MAT3x2" value="0x8B67"/> - <enum name="GL_FLOAT_MAT3x4" value="0x8B68"/> - <enum name="GL_FLOAT_MAT4x2" value="0x8B69"/> - <enum name="GL_FLOAT_MAT4x3" value="0x8B6A"/> - <enum name="GL_SRGB" value="0x8C40"/> - <enum name="GL_SRGB8" value="0x8C41"/> - <enum name="GL_SRGB_ALPHA" value="0x8C42"/> - <enum name="GL_SRGB8_ALPHA8" value="0x8C43"/> - <enum name="GL_SLUMINANCE_ALPHA" value="0x8C44"/> - <enum name="GL_SLUMINANCE8_ALPHA8" value="0x8C45"/> - <enum name="GL_SLUMINANCE" value="0x8C46"/> - <enum name="GL_SLUMINANCE8" value="0x8C47"/> - <enum name="GL_COMPRESSED_SRGB" value="0x8C48"/> - <enum name="GL_COMPRESSED_SRGB_ALPHA" value="0x8C49"/> - <enum name="GL_COMPRESSED_SLUMINANCE" value="0x8C4A"/> - <enum name="GL_COMPRESSED_SLUMINANCE_ALPHA" value="0x8C4B"/> + <enum name="CURRENT_RASTER_SECONDARY_COLOR" value="0x845F"/> + <enum name="PIXEL_PACK_BUFFER" value="0x88EB"/> + <enum name="PIXEL_UNPACK_BUFFER" value="0x88EC"/> + <enum name="PIXEL_PACK_BUFFER_BINDING" value="0x88ED"/> + <enum name="PIXEL_UNPACK_BUFFER_BINDING" value="0x88EF"/> + <enum name="FLOAT_MAT2x3" value="0x8B65"/> + <enum name="FLOAT_MAT2x4" value="0x8B66"/> + <enum name="FLOAT_MAT3x2" value="0x8B67"/> + <enum name="FLOAT_MAT3x4" value="0x8B68"/> + <enum name="FLOAT_MAT4x2" value="0x8B69"/> + <enum name="FLOAT_MAT4x3" value="0x8B6A"/> + <enum name="SRGB" value="0x8C40"/> + <enum name="SRGB8" value="0x8C41"/> + <enum name="SRGB_ALPHA" value="0x8C42"/> + <enum name="SRGB8_ALPHA8" value="0x8C43"/> + <enum name="SLUMINANCE_ALPHA" value="0x8C44"/> + <enum name="SLUMINANCE8_ALPHA8" value="0x8C45"/> + <enum name="SLUMINANCE" value="0x8C46"/> + <enum name="SLUMINANCE8" value="0x8C47"/> + <enum name="COMPRESSED_SRGB" value="0x8C48"/> + <enum name="COMPRESSED_SRGB_ALPHA" value="0x8C49"/> + <enum name="COMPRESSED_SLUMINANCE" value="0x8C4A"/> + <enum name="COMPRESSED_SLUMINANCE_ALPHA" value="0x8C4B"/> <function name="UniformMatrix2x3fv" offset="assign"> <param name="location" type="GLint"/> @@ -12326,6 +12326,12 @@ </function> </category> +<category name="GL_MESA_texture_signed_rgba"> + <enum name="SIGNED_NORMALIZED" value="0x8F9C"/> + <enum name="RGBA_SNORM" value="0x8F93"/> + <enum name="RGBA8_SNORM" value="0x8F97"/> +</category> + <category name="GL_MESA_shader_debug"> <enum name="DEBUG_OBJECT_MESA" value="0x8759"/> <enum name="DEBUG_PRINT_MESA" value="0x875A"/> |