diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-07-15 14:17:07 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-07-15 14:17:07 -0400 |
| commit | c5c19919ce627b98d8aab4284da1694573bcccd4 (patch) | |
| tree | 2e29b313b79b6a392e020fd5723e3cc00c800fd2 /src/mesa/glapi/gl_API.xml | |
| parent | a0d4a12614fce072fa1eb5516e626909171c95e1 (diff) | |
| parent | 3a3b83e5112b725e22f05b32a273a2351b820944 (diff) | |
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
This builds, but I get an assertion in radeonGetLock() due to
the drawable being null.
Diffstat (limited to 'src/mesa/glapi/gl_API.xml')
| -rw-r--r-- | src/mesa/glapi/gl_API.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml index aa893b1e02..06560d175a 100644 --- a/src/mesa/glapi/gl_API.xml +++ b/src/mesa/glapi/gl_API.xml @@ -7950,6 +7950,10 @@ <xi:include href="ARB_copy_buffer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="ARB_map_buffer_range.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"/> + <!-- Non-ARB extensions sorted by extension number. --> @@ -12226,6 +12230,8 @@ <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"/> + <category name="GL_EXT_framebuffer_blit" number="316"> <enum name="READ_FRAMEBUFFER_EXT" value="0x8CA8"/> <enum name="DRAW_FRAMEBUFFER_EXT" value="0x8CA9"/> |