diff options
| author | Emil Velikov <[email protected]> | 2015-11-26 00:36:10 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-12-04 16:36:45 +0000 |
| commit | 6cc9a53d84fba33a3557826f6fc9b34d67c44069 (patch) | |
| tree | 3752d3aea85af3cb666771bbbf50ea22694d5d01 | |
| parent | 0a51e77fa1e858c0593579f2052d70bb1602e167 (diff) | |
glapi: add GetPointervKHR to the ES dispatch
The KHR_debug extension implements this.
Strictly speaking it could be used with ES 1.0, although as the original
function is available on ES 1.1, I'm inclined to lift the KHR_debug
requirement to ES 1.1.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93048
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
(cherry picked from commit f53f9eb8d495a318bc8e6fd758df4ba4074599ef)
Squashed with commit
mesa/tests: add KHR_debug GLES glGetPointervKHR entry points
Should have been part of commit f53f9eb8d49 "glapi: add GetPointervKHR
to the ES dispatch".
v2: comment out the ES1.1 symbol and use the same description (pattern)
as elsewhere (Matt)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93235
Fixes: f53f9eb8d49 "glapi: add GetPointervKHR to the ES dispatch".
Signed-off-by: Emil Velikov <[email protected]>
Tested-by: Vinson Lee <[email protected]> (v1)
Tested-by: Michel Dänzer <[email protected]>
(cherry picked from commit 1074e38fbbc89a06c74f036622cbe2778bee993a)
| -rw-r--r-- | src/mapi/glapi/gen/KHR_debug.xml | 5 | ||||
| -rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/KHR_debug.xml b/src/mapi/glapi/gen/KHR_debug.xml index e4a5a5b01e6..431a788c961 100644 --- a/src/mapi/glapi/gen/KHR_debug.xml +++ b/src/mapi/glapi/gen/KHR_debug.xml @@ -181,6 +181,11 @@ <param name="messageLog" type="GLchar *" output="true"/> </function> + <function name="GetPointervKHR" alias="GetPointerv" es1="1.1" es2="2.0"> + <param name="pname" type="GLenum"/> + <param name="params" type="GLvoid **" output="true"/> + </function> + <function name="PushDebugGroupKHR" alias="PushDebugGroup" es1="1.0" es2="2.0"> <param name="source" type="GLenum"/> <param name="id" type="GLuint"/> diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index 97f81f932f6..d288b1dbe94 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -1937,7 +1937,8 @@ const struct function gles11_functions_possible[] = { { "glGetLightxv", 11, -1 }, { "glGetMaterialfv", 11, _gloffset_GetMaterialfv }, { "glGetMaterialxv", 11, -1 }, - { "glGetPointerv", 11, _gloffset_GetPointerv }, + // We check for the aliased -KHR version in GLES 1.1 +// { "glGetPointerv", 11, _gloffset_GetPointerv }, { "glGetRenderbufferParameterivOES", 11, -1 }, { "glGetString", 11, _gloffset_GetString }, { "glGetTexEnvfv", 11, _gloffset_GetTexEnvfv }, @@ -2049,6 +2050,7 @@ const struct function gles11_functions_possible[] = { { "glGetDebugMessageLogKHR", 11, -1 }, { "glGetObjectLabelKHR", 11, -1 }, { "glGetObjectPtrLabelKHR", 11, -1 }, + { "glGetPointervKHR", 11, _gloffset_GetPointerv }, { "glObjectLabelKHR", 11, -1 }, { "glObjectPtrLabelKHR", 11, -1 }, @@ -2284,6 +2286,7 @@ const struct function gles2_functions_possible[] = { { "glGetDebugMessageLogKHR", 20, -1 }, { "glGetObjectLabelKHR", 20, -1 }, { "glGetObjectPtrLabelKHR", 20, -1 }, + { "glGetPointervKHR", 20, -1 }, { "glObjectLabelKHR", 20, -1 }, { "glObjectPtrLabelKHR", 20, -1 }, |