diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-16 08:45:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-16 08:45:43 +0100 |
| commit | b8219a4680768e14b7fe4930adf86e9be261b31f (patch) | |
| tree | 193855ef8d48765d67cc11153a15e3c1e2568e50 /mesalib/src/mapi | |
| parent | 15cdb95b194cb051a5d469cc9eb73eb0eed4db41 (diff) | |
| parent | 811d1bcf6d61ea49551abdd7f2294c5af2776913 (diff) | |
| download | vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.tar.gz vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.tar.bz2 vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Switched to xcalc-1.0.5
Switched to bdftopcf-1.0.4
libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config
Diffstat (limited to 'mesalib/src/mapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_internalformat_query.xml | 21 | ||||
| -rwxr-xr-x | mesalib/src/mapi/glapi/gen/gl_API.xml | 6 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/gl_genexec.py | 1 |
3 files changed, 26 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_internalformat_query.xml b/mesalib/src/mapi/glapi/gen/ARB_internalformat_query.xml new file mode 100644 index 000000000..70a2a3109 --- /dev/null +++ b/mesalib/src/mapi/glapi/gen/ARB_internalformat_query.xml @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<OpenGLAPI> + +<category name="GL_ARB_internalformat_query" number="112"> + <!-- Other existing enums are reused for this extension. --> + + <enum name="NUM_SAMPLE_COUNTS" value="0x9380"/> + + <function name="GetInternalformativ" offset="assign" static_dispatch="false" + es2="3.0"> + <param name="target" type="GLenum"/> + <param name="internalformat" type="GLenum"/> + <param name="pname" type="GLenum"/> + <param name="bufSize" type="GLsizei"/> + <param name="params" type="GLint *"/> + </function> +</category> + +</OpenGLAPI> diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index adbeea613..f9a67d2ca 100755 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -8298,13 +8298,15 @@ </function> </category> -<!-- ARB extensions #110...#112 --> +<!-- ARB extensions #110...#116 --> + +<xi:include href="ARB_internalformat_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <category name="GL_ARB_map_buffer_alignment" number="113"> <enum name="MIN_MAP_BUFFER_ALIGNMENT" value="0x90BC" /> </category> -<!-- ARB extensions #114...#116 --> +<xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="ARB_texture_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> diff --git a/mesalib/src/mapi/glapi/gen/gl_genexec.py b/mesalib/src/mapi/glapi/gen/gl_genexec.py index da9ae716a..a85b4471a 100644 --- a/mesalib/src/mapi/glapi/gen/gl_genexec.py +++ b/mesalib/src/mapi/glapi/gen/gl_genexec.py @@ -108,6 +108,7 @@ header = """/** #include "main/shaderapi.h" #include "main/uniforms.h" #include "main/syncobj.h" +#include "main/formatquery.h" #include "main/dispatch.h" |