diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
| commit | c67a0f76ca34e441a817a7cdf261f496f3b3f2d6 (patch) | |
| tree | c197b74a8c2f076aaa4f5506b90d6ad8e38b52b2 /mesalib/src/mapi/glapi/gen/gl_API.xml | |
| parent | 8d07c58314685d56a0586d0a437b541ea2b92a54 (diff) | |
| parent | 2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (diff) | |
| download | vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.gz vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.bz2 vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013
Conflicts:
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/gl_API.xml')
| -rwxr-xr-x | mesalib/src/mapi/glapi/gen/gl_API.xml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index 4aa8b15e3..adbeea613 100755 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -8269,20 +8269,18 @@ </function> </category> +<!-- ARB extensions #95...#108 --> + <xi:include href="ARB_ES2_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<!-- ARB extensions #96...#103 --> +<xi:include href="ARB_get_program_binary.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="ARB_debug_output.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="ARB_robustness.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<!-- ARB extensions #106 --> - <xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<!-- ARB extensions #108 --> - <category name="GL_ARB_transform_feedback_instanced" number="109"> <function name="DrawTransformFeedbackInstanced" offset="assign" exec="dynamic"> @@ -12994,6 +12992,4 @@ <xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<xi:include href="ARB_get_program_binary.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - </OpenGLAPI> |