diff options
author | José Fonseca <jfonseca@vmware.com> | 2010-01-08 15:42:57 +0000 |
---|---|---|
committer | José Fonseca <jfonseca@vmware.com> | 2010-01-08 15:42:57 +0000 |
commit | 080c40ab32b2abd6d8381b4a0cc143d36a1652b2 (patch) | |
tree | e173767ebc5a82d81b9fc086449d915e29348976 /src/mesa/glapi/ARB_framebuffer_object.xml | |
parent | 9cdf6f025b2ed55cfb13dd09f870f01d0c7947d3 (diff) | |
parent | a1de400e8de06a80ab140bb0fa950e990607572d (diff) |
Merge remote branch 'origin/master' into lp-binning
Conflicts:
src/gallium/auxiliary/util/u_surface.c
src/gallium/drivers/llvmpipe/Makefile
src/gallium/drivers/llvmpipe/SConscript
src/gallium/drivers/llvmpipe/lp_bld_arit.c
src/gallium/drivers/llvmpipe/lp_bld_flow.c
src/gallium/drivers/llvmpipe/lp_bld_interp.c
src/gallium/drivers/llvmpipe/lp_clear.c
src/gallium/drivers/llvmpipe/lp_context.c
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/llvmpipe/lp_draw_arrays.c
src/gallium/drivers/llvmpipe/lp_jit.c
src/gallium/drivers/llvmpipe/lp_jit.h
src/gallium/drivers/llvmpipe/lp_prim_vbuf.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_state.h
src/gallium/drivers/llvmpipe/lp_state_blend.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/gallium/drivers/llvmpipe/lp_state_sampler.c
src/gallium/drivers/llvmpipe/lp_state_surface.c
src/gallium/drivers/llvmpipe/lp_tex_cache.c
src/gallium/drivers/llvmpipe/lp_tex_cache.h
src/gallium/drivers/llvmpipe/lp_tex_sample.h
src/gallium/drivers/llvmpipe/lp_tile_cache.c
Diffstat (limited to 'src/mesa/glapi/ARB_framebuffer_object.xml')
-rw-r--r-- | src/mesa/glapi/ARB_framebuffer_object.xml | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/mesa/glapi/ARB_framebuffer_object.xml b/src/mesa/glapi/ARB_framebuffer_object.xml index b700e7e77d..e6bdcd6e50 100644 --- a/src/mesa/glapi/ARB_framebuffer_object.xml +++ b/src/mesa/glapi/ARB_framebuffer_object.xml @@ -12,10 +12,10 @@ <enum name="RENDERBUFFER" value="0x8D41"/> - <enum name="STENCIL_INDEX1_EXT" value="0x8D46"/> - <enum name="STENCIL_INDEX4_EXT" value="0x8D47"/> - <enum name="STENCIL_INDEX8_EXT" value="0x8D48"/> - <enum name="STENCIL_INDEX16_EXT" value="0x8D49"/> + <enum name="STENCIL_INDEX1" value="0x8D46"/> + <enum name="STENCIL_INDEX4" value="0x8D47"/> + <enum name="STENCIL_INDEX8" value="0x8D48"/> + <enum name="STENCIL_INDEX16" value="0x8D49"/> <enum name="RENDERBUFFER_WIDTH" value="0x8D42"/> <enum name="RENDERBUFFER_HEIGHT" value="0x8D43"/> @@ -93,33 +93,35 @@ <enum name="STENCIL_ATTACHMENT" value="0x8D20"/> <enum name="DEPTH_STENCIL_ATTACHMENT" value="0x821A"/> - <enum name="MAX_SAMPLES" value="0x8D57"/> + <enum name="MAX_SAMPLES" count="1" value="0x8D57"> + <size name="Get" mode="get"/> + </enum> <enum name="FRAMEBUFFER_COMPLETE" value="0x8CD5"/> <enum name="FRAMEBUFFER_INCOMPLETE_ATTACHMENT" value="0x8CD6"/> <enum name="FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT" value="0x8CD7"/> - <enum name="FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT" value="0x8CDB"/> - <enum name="FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT" value="0x8CDC"/> + <enum name="FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER" value="0x8CDB"/> + <enum name="FRAMEBUFFER_INCOMPLETE_READ_BUFFER" value="0x8CDC"/> <enum name="FRAMEBUFFER_UNSUPPORTED" value="0x8CDD"/> <enum name="FRAMEBUFFER_INCOMPLETE_MULTISAMPLE" value="0x8D56"/> <enum name="FRAMEBUFFER_UNDEFINED" value="0x8219"/> - <enum name="FRAMEBUFFER_BINDING_EXT" count="1" value="0x8CA6"> + <enum name="FRAMEBUFFER_BINDING" count="1" value="0x8CA6"> <size name="Get" mode="get"/> </enum> - <enum name="DRAW_FRAMEBUFFER_BINDING_EXT" count="1" value="0x8CA6"> + <enum name="DRAW_FRAMEBUFFER_BINDING" count="1" value="0x8CA6"> <size name="Get" mode="get"/> </enum> - <enum name="READ_FRAMEBUFFER_BINDING_EXT" count="1" value="0x8CAA"> + <enum name="READ_FRAMEBUFFER_BINDING" count="1" value="0x8CAA"> <size name="Get" mode="get"/> </enum> - <enum name="RENDERBUFFER_BINDING_EXT" count="1" value="0x8CA7"> + <enum name="RENDERBUFFER_BINDING" count="1" value="0x8CA7"> <size name="Get" mode="get"/> </enum> - <enum name="MAX_COLOR_ATTACHMENTS_EXT" count="1" value="0x8CDF"> + <enum name="MAX_COLOR_ATTACHMENTS" count="1" value="0x8CDF"> <size name="Get" mode="get"/> </enum> - <enum name="MAX_RENDERBUFFER_SIZE_EXT" count="1" value="0x84E8"> + <enum name="MAX_RENDERBUFFER_SIZE" count="1" value="0x84E8"> <size name="Get" mode="get"/> </enum> @@ -131,7 +133,10 @@ <enum name="DEPTH24_STENCIL8" value="0x88F0"/> - <enum name="TEXTURE_STENCIL_SIZE" value="0x88F1"/> + <enum name="TEXTURE_STENCIL_SIZE" count="1" value="0x88F1"> + <size name="GetTexLevelParameterfv" mode="get"/> + <size name="GetTexLevelParameteriv" mode="get"/> + </enum> @@ -168,6 +173,7 @@ <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> + <glx rop="4331"/> </function> <function name="GetRenderbufferParameteriv" alias="GetRenderbufferParameterivEXT"> |