summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/getstring.c
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2015-11-05 20:22:25 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2015-11-20 11:14:05 +0000
commitaf272368547600e1db87d4dd5d718e41ea9db6c0 (patch)
tree862a4c93a4e43fbb6645005048f72b298fbc8f1f /src/mesa/main/getstring.c
parent9108a785a0fc6bb47ca577d2e2bdcf3728fead43 (diff)
downloadexternal_mesa3d-af272368547600e1db87d4dd5d718e41ea9db6c0.zip
external_mesa3d-af272368547600e1db87d4dd5d718e41ea9db6c0.tar.gz
external_mesa3d-af272368547600e1db87d4dd5d718e41ea9db6c0.tar.bz2
mesa: use the correct string for the ES GL_KHR_debug functions
As defined in the spec when implemented in an OpenGL ES context, all entry points defined by this extension must have a "KHR" suffix. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'src/mesa/main/getstring.c')
-rw-r--r--src/mesa/main/getstring.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 9873fdb..2e339c8 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -203,12 +203,18 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
{
GET_CURRENT_CONTEXT(ctx);
const GLuint clientUnit = ctx->Array.ActiveTexture;
+ const char *callerstr;
+
+ if (_mesa_is_desktop_gl(ctx))
+ callerstr = "glGetPointerv";
+ else
+ callerstr = "glGetPointervKHR";
if (!params)
return;
if (MESA_VERBOSE & VERBOSE_API)
- _mesa_debug(ctx, "glGetPointerv %s\n", _mesa_enum_to_string(pname));
+ _mesa_debug(ctx, "%s %s\n", callerstr, _mesa_enum_to_string(pname));
switch (pname) {
case GL_VERTEX_ARRAY_POINTER:
@@ -280,7 +286,7 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
return;
invalid_pname:
- _mesa_error( ctx, GL_INVALID_ENUM, "glGetPointerv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "%s", callerstr);
return;
}