diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2019-11-19 12:44:29 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-02-05 16:57:21 +0000 |
| commit | a3e4b96ea6dce86a66023202a709031b424052d7 (patch) | |
| tree | e416bc4b2843b7aeaf82da1d01b538d8cabcde60 | |
| parent | 6cd88f51f3c758cb77f8cb578cf6a2ee227ca92b (diff) | |
mapi: add GetInteger64vEXT with EXT_disjoint_timer_query
From EXT_disjoint_timer_query spec:
"Interaction: This extension adds GetInteger64vEXT if
OpenGL ES 3.0 is not supported"
See https://github.com/KhronosGroup/OpenGL-Registry/issues/326.
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2090
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3707>
| -rw-r--r-- | src/mapi/glapi/gen/es_EXT.xml | 6 | ||||
| -rw-r--r-- | src/mapi/glapi/registry/gl.xml | 7 | ||||
| -rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 4 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml index e3cad15679d..adbcba1ed2a 100644 --- a/src/mapi/glapi/gen/es_EXT.xml +++ b/src/mapi/glapi/gen/es_EXT.xml @@ -864,6 +864,12 @@ <param name="id" type="GLuint"/> <param name="target" type="GLenum"/> </function> + + <function name="GetInteger64vEXT" alias="GetInteger64v" es2="2.0"> + <param name="pname" type="GLenum"/> + <param name="params" type="GLint64 *" output="true" variable_param="pname"/> + </function> + </category> <!-- 151. GL_EXT_draw_buffers --> diff --git a/src/mapi/glapi/registry/gl.xml b/src/mapi/glapi/registry/gl.xml index 3a2010f17cb..e2cd8c8c148 100644 --- a/src/mapi/glapi/registry/gl.xml +++ b/src/mapi/glapi/registry/gl.xml @@ -18084,6 +18084,12 @@ typedef unsigned int GLhandleARB; <alias name="glGetInteger64v"/> </command> <command> + <proto>void <name>glGetInteger64vEXT</name></proto> + <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param> + <param len="COMPSIZE(pname)"><ptype>GLint64</ptype> *<name>data</name></param> + <alias name="glGetInteger64v"/> + </command> + <command> <proto>void <name>glGetIntegerIndexedvEXT</name></proto> <param><ptype>GLenum</ptype> <name>target</name></param> <param><ptype>GLuint</ptype> <name>index</name></param> @@ -44871,6 +44877,7 @@ typedef unsigned int GLhandleARB; <command name="glGetQueryObjectuivEXT"/> <command name="glGetQueryObjecti64vEXT"/> <command name="glGetQueryObjectui64vEXT"/> + <command name="glGetInteger64vEXT"/> </require> </extension> <extension name="GL_EXT_draw_buffers" supported="gles2"> diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index 3c501ce4a33..aa3796806d4 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -2412,6 +2412,7 @@ const struct function gles2_functions_possible[] = { { "glGetQueryObjecti64vEXT", 20, -1 }, { "glGetQueryObjectui64vEXT", 20, -1 }, { "glQueryCounterEXT", 20, -1 }, + { "glGetInteger64vEXT", 20, -1 }, /* GL_EXT_shader_framebuffer_fetch_non_coherent */ { "glFramebufferFetchBarrierEXT", 20, -1 }, @@ -2495,7 +2496,8 @@ const struct function gles3_functions_possible[] = { // { "glGetBufferPointerv", 30, -1 }, { "glGetFragDataLocation", 30, -1 }, { "glGetInteger64i_v", 30, -1 }, - { "glGetInteger64v", 30, -1 }, + // We check for the aliased -EXT version in GLES 2 + //{ "glGetInteger64v", 30, -1 }, { "glGetIntegeri_v", 30, -1 }, { "glGetInternalformativ", 30, -1 }, { "glGetInternalformati64v", 30, -1 }, |