diff options
| author | Michal Krol <michal@vmware.com> | 2009-12-12 16:48:32 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-12-12 16:48:32 +0100 |
| commit | a3eb0f718e19653a2ad8e49396c904183be456f3 (patch) | |
| tree | 0092574c469ea586a6cab8b8ebb7ac62b8221a2a /src/mesa/glapi/gl_API.xml | |
| parent | 491f384c3958067e6c4c994041f5d8d413b806bc (diff) | |
| parent | 784cca9fa527de771754d76545970f78094b9adf (diff) | |
Merge branch 'master' into glsl-pp-rework-2
Conflicts:
progs/perf/drawoverhead.c
progs/perf/teximage.c
progs/perf/vbo.c
progs/perf/vertexrate.c
src/mesa/shader/slang/library/slang_common_builtin_gc.h
Diffstat (limited to 'src/mesa/glapi/gl_API.xml')
| -rw-r--r-- | src/mesa/glapi/gl_API.xml | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml index da4be14707..34c7746e1b 100644 --- a/src/mesa/glapi/gl_API.xml +++ b/src/mesa/glapi/gl_API.xml @@ -12238,30 +12238,9 @@ <xi:include href="EXT_framebuffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<xi:include href="EXT_provoking_vertex.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="EXT_packed_depth_stencil.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<category name="GL_EXT_framebuffer_blit" number="316"> - <enum name="READ_FRAMEBUFFER_EXT" value="0x8CA8"/> - <enum name="DRAW_FRAMEBUFFER_EXT" value="0x8CA9"/> - <enum name="DRAW_FRAMEBUFFER_BINDING_EXT" count="1" value="0x8CA6"> - <size name="Get" mode="get"/> - </enum> - <enum name="READ_FRAMEBUFFER_BINDING_EXT" count="1" value="0x8CAA"> - <size name="Get" mode="get"/> - </enum> - <function name="BlitFramebufferEXT" offset="assign" static_dispatch="false"> - <param name="srcX0" type="GLint"/> - <param name="srcY0" type="GLint"/> - <param name="srcX1" type="GLint"/> - <param name="srcY1" type="GLint"/> - <param name="dstX0" type="GLint"/> - <param name="dstY0" type="GLint"/> - <param name="dstX1" type="GLint"/> - <param name="dstY1" type="GLint"/> - <param name="mask" type="GLbitfield"/> - <param name="filter" type="GLenum"/> - </function> -</category> +<xi:include href="EXT_provoking_vertex.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <category name="GL_APPLE_flush_buffer_range" number="321"> <enum name="BUFFER_SERIALIZED_MODIFY_APPLE" count="1" value="0x8A12"> |