KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Emil Velikov 2015-11-05 20:22:25 +00:00
parent 9108a785a0
commit af27236854
3 changed files with 77 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/mesa/main/errors.c
View File

@ -978,9 +978,13 @@ _mesa_DebugMessageInsert(GLenum source, GLenum type, GLuint id,
GLenum severity, GLint length,
const GLchar *buf)
{
const char *callerstr = "glDebugMessageInsert";
GET_CURRENT_CONTEXT(ctx);
const char *callerstr;
if (_mesa_is_desktop_gl(ctx))
callerstr = "glDebugMessageInsert";
else
callerstr = "glDebugMessageInsertKHR";
if (!validate_params(ctx, INSERT, callerstr, source, type, severity))
return; /* GL_INVALID_ENUM */
@ -1004,15 +1008,21 @@ _mesa_GetDebugMessageLog(GLuint count, GLsizei logSize, GLenum *sources,
{
GET_CURRENT_CONTEXT(ctx);
struct gl_debug_state *debug;
const char *callerstr;
GLuint ret;
if (_mesa_is_desktop_gl(ctx))
callerstr = "glGetDebugMessageLog";
else
callerstr = "glGetDebugMessageLogKHR";
if (!messageLog)
logSize = 0;
if (logSize < 0) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glGetDebugMessageLog(logSize=%d : logSize must not be"
" negative)", logSize);
"%s(logSize=%d : logSize must not be negative)",
callerstr, logSize);
return 0;
}
@ -1066,9 +1076,14 @@ _mesa_DebugMessageControl(GLenum gl_source, GLenum gl_type,
enum mesa_debug_source source = gl_enum_to_debug_source(gl_source);
enum mesa_debug_type type = gl_enum_to_debug_type(gl_type);
enum mesa_debug_severity severity = gl_enum_to_debug_severity(gl_severity);
const char *callerstr = "glDebugMessageControl";
const char *callerstr;
struct gl_debug_state *debug;
if (_mesa_is_desktop_gl(ctx))
callerstr = "glDebugMessageControl";
else
callerstr = "glDebugMessageControlKHR";
if (count < 0) {
_mesa_error(ctx, GL_INVALID_VALUE,
"%s(count=%d : count must not be negative)", callerstr,
@ -1124,9 +1139,15 @@ _mesa_PushDebugGroup(GLenum source, GLuint id, GLsizei length,
const GLchar *message)
{
GET_CURRENT_CONTEXT(ctx);
const char *callerstr = "glPushDebugGroup";
const char *callerstr;
struct gl_debug_state *debug;
struct gl_debug_message *emptySlot;
GLuint ret;
if (_mesa_is_desktop_gl(ctx))
callerstr = "glPushDebugGroup";
else
callerstr = "glPushDebugGroupKHR";
switch(source) {
case GL_DEBUG_SOURCE_APPLICATION:
@ -1176,10 +1197,15 @@ void GLAPIENTRY
_mesa_PopDebugGroup(void)
{
GET_CURRENT_CONTEXT(ctx);
const char *callerstr = "glPopDebugGroup";
const char *callerstr;
struct gl_debug_state *debug;
struct gl_debug_message *gdmessage, msg;
if (_mesa_is_desktop_gl(ctx))
callerstr = "glPopDebugGroup";
else
callerstr = "glPopDebugGroupKHR";
debug = _mesa_lock_debug_state(ctx);
if (!debug)
return;

10
src/mesa/main/getstring.c
View File

@ -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;
}

46
src/mesa/main/objectlabel.c
View File

@ -243,13 +243,19 @@ _mesa_ObjectLabel(GLenum identifier, GLuint name, GLsizei length,
const GLchar *label)
{
GET_CURRENT_CONTEXT(ctx);
const char *callerstr;
char **labelPtr;
labelPtr = get_label_pointer(ctx, identifier, name, "glObjectLabel");
if (_mesa_is_desktop_gl(ctx))
callerstr = "glObjectLabel";
else
callerstr = "glObjectLabelKHR";
labelPtr = get_label_pointer(ctx, identifier, name, callerstr);
if (!labelPtr)
return;
set_label(ctx, labelPtr, label, length, "glObjectLabel");
set_label(ctx, labelPtr, label, length, callerstr);
}
void GLAPIENTRY
@ -257,15 +263,21 @@ _mesa_GetObjectLabel(GLenum identifier, GLuint name, GLsizei bufSize,
GLsizei *length, GLchar *label)
{
GET_CURRENT_CONTEXT(ctx);
const char *callerstr;
char **labelPtr;
if (_mesa_is_desktop_gl(ctx))
callerstr = "glGetObjectLabel";
else
callerstr = "glGetObjectLabelKHR";
if (bufSize < 0) {
_mesa_error(ctx, GL_INVALID_VALUE, "glGetObjectLabel(bufSize = %d)",
_mesa_error(ctx, GL_INVALID_VALUE, "%s(bufSize = %d)", callerstr,
bufSize);
return;
}
labelPtr = get_label_pointer(ctx, identifier, name, "glGetObjectLabel");
labelPtr = get_label_pointer(ctx, identifier, name, callerstr);
if (!labelPtr)
return;
@ -276,17 +288,24 @@ void GLAPIENTRY
_mesa_ObjectPtrLabel(const void *ptr, GLsizei length, const GLchar *label)
{
GET_CURRENT_CONTEXT(ctx);
char **labelPtr;
struct gl_sync_object *const syncObj = (struct gl_sync_object *) ptr;
const char *callerstr;
char **labelPtr;
if (_mesa_is_desktop_gl(ctx))
callerstr = "glObjectPtrLabel";
else
callerstr = "glObjectPtrLabelKHR";
if (!_mesa_validate_sync(ctx, syncObj)) {
_mesa_error(ctx, GL_INVALID_VALUE, "glObjectPtrLabel (not a valid sync object)");
_mesa_error(ctx, GL_INVALID_VALUE, "%s (not a valid sync object)",
callerstr);
return;
}
labelPtr = &syncObj->Label;
set_label(ctx, labelPtr, label, length, "glObjectPtrLabel");
set_label(ctx, labelPtr, label, length, callerstr);
}
void GLAPIENTRY
@ -294,17 +313,24 @@ _mesa_GetObjectPtrLabel(const void *ptr, GLsizei bufSize, GLsizei *length,
GLchar *label)
{
GET_CURRENT_CONTEXT(ctx);
char **labelPtr;
struct gl_sync_object *const syncObj = (struct gl_sync_object *) ptr;
const char *callerstr;
char **labelPtr;
if (_mesa_is_desktop_gl(ctx))
callerstr = "glGetObjectPtrLabel";
else
callerstr = "glGetObjectPtrLabelKHR";
if (bufSize < 0) {
_mesa_error(ctx, GL_INVALID_VALUE, "glGetObjectPtrLabel(bufSize = %d)",
_mesa_error(ctx, GL_INVALID_VALUE, "%s(bufSize = %d)", callerstr,
bufSize);
return;
}
if (!_mesa_validate_sync(ctx, syncObj)) {
_mesa_error(ctx, GL_INVALID_VALUE, "glGetObjectPtrLabel (not a valid sync object)");
_mesa_error(ctx, GL_INVALID_VALUE, "%s (not a valid sync object)",
callerstr);
return;
}