diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2012-11-30 12:43:58 -0800 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-01-15 21:34:45 -0800 |
commit | bda540d2357f69a63dcf16550e178f803682d6ce (patch) | |
tree | 70d8b95af1ab2732b4416358f199a056aab93a9d /src | |
parent | 5e4bb063f03a066eb60225b544b81036ebf78638 (diff) | |
download | external_mesa3d-bda540d2357f69a63dcf16550e178f803682d6ce.zip external_mesa3d-bda540d2357f69a63dcf16550e178f803682d6ce.tar.gz external_mesa3d-bda540d2357f69a63dcf16550e178f803682d6ce.tar.bz2 |
mesa: Add dispatch and extension XML for GL_ARB_internalformat_query
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/mapi/glapi/gen/ARB_internalformat_query.xml | 21 | ||||
-rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 6 | ||||
-rw-r--r-- | src/mapi/glapi/gen/gl_genexec.py | 1 | ||||
-rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 6 |
4 files changed, 30 insertions, 4 deletions
diff --git a/src/mapi/glapi/gen/ARB_internalformat_query.xml b/src/mapi/glapi/gen/ARB_internalformat_query.xml new file mode 100644 index 0000000..70a2a31 --- /dev/null +++ b/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/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 9343860..4e5bef7 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/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/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py index da9ae71..a85b447 100644 --- a/src/mapi/glapi/gen/gl_genexec.py +++ b/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" diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index 3cc6bbd..5e1a7b5 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -900,6 +900,9 @@ const struct function gl_core_functions_possible[] = { // { "glTextureStorage2DMultisampleEXT", 43, -1 }, // XXX: Add to xml // { "glTextureStorage3DMultisampleEXT", 43, -1 }, // XXX: Add to xml + /* GL_ARB_internalformat_query */ + { "glGetInternalformativ", 30, -1 }, + { NULL, 0, -1 } }; @@ -1323,8 +1326,7 @@ const struct function gles3_functions_possible[] = { { "glGetInteger64i_v", 30, -1 }, { "glGetInteger64v", 30, -1 }, { "glGetIntegeri_v", 30, -1 }, - // XXX: Missing implementation of ARB_internalformat_query - // { "glGetInternalformativ", 30, -1 }, + { "glGetInternalformativ", 30, -1 }, // glGetProgramBinary aliases glGetProgramBinaryOES in GLES 2 { "glGetQueryiv", 30, -1 }, { "glGetQueryObjectuiv", 30, -1 }, |