Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-01-10 23:07:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] egl: use debug context and make it configurable

Browse Source 
The boolean option egl:debug is used to control whether we want debug
output or not. This defaults to true to aid in debugging.
This commit is contained in:
Quantum 2021-07-18 00:14:31 -04:00 committed by Geoffrey McRae
parent 6472c28473
commit a4bf3c8088
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/renderers/EGL/egl.c
View File

@ -177,6 +177,13 @@ static struct Option egl_options[] =
.validator = egl_desktop_scale_validate, .validator = egl_desktop_scale_validate,
.value.x_int = 0 .value.x_int = 0
}, },
{
.module = "egl",
.name = "debug",
.description = "Enable debug output",
.type = OPTION_TYPE_BOOL,
.value.x_bool = false
},
{0} {0}
}; };
@ -661,10 +668,9 @@ static void debugCallback(GLenum source, GLenum type, GLuint id,
level = DEBUG_LEVEL_WARN; level = DEBUG_LEVEL_WARN;
break; break;
case GL_DEBUG_SEVERITY_LOW: case GL_DEBUG_SEVERITY_LOW:
case GL_DEBUG_SEVERITY_NOTIFICATION:
level = DEBUG_LEVEL_INFO; level = DEBUG_LEVEL_INFO;
break; break;
case GL_DEBUG_SEVERITY_NOTIFICATION:
return;
} }
const char * sourceName = "unknown"; const char * sourceName = "unknown";
@ -785,9 +791,11 @@ bool egl_render_startup(void * opaque)
return false; return false;
} }
bool debugContext = option_get_bool("egl", "debug");
EGLint ctxattr[] = EGLint ctxattr[] =
{ {
EGL_CONTEXT_CLIENT_VERSION, 2, EGL_CONTEXT_CLIENT_VERSION, 2,
EGL_CONTEXT_OPENGL_DEBUG , debugContext ? EGL_TRUE : EGL_FALSE,
EGL_NONE EGL_NONE
}; };
@ -855,20 +863,23 @@ bool egl_render_startup(void * opaque)
DEBUG_INFO("glEGLImageTargetTexture2DOES unavilable, DMA support disabled"); DEBUG_INFO("glEGLImageTargetTexture2DOES unavilable, DMA support disabled");
} }
if (debugContext)
{
if ((esMaj > 3 || (esMaj == 3 && esMin >= 2)) && g_egl_dynProcs.glDebugMessageCallback) if ((esMaj > 3 || (esMaj == 3 && esMin >= 2)) && g_egl_dynProcs.glDebugMessageCallback)
{ {
glEnable(GL_DEBUG_OUTPUT);
g_egl_dynProcs.glDebugMessageCallback(debugCallback, NULL); g_egl_dynProcs.glDebugMessageCallback(debugCallback, NULL);
DEBUG_INFO("Using debug message callback from OpenGL ES 3.2+"); DEBUG_INFO("Using debug message callback from OpenGL ES 3.2+");
} }
else if (util_hasGLExt(gl_exts, "GL_KHR_debug") && g_egl_dynProcs.glDebugMessageCallbackKHR) else if (util_hasGLExt(gl_exts, "GL_KHR_debug") && g_egl_dynProcs.glDebugMessageCallbackKHR)
{ {
glEnable(GL_DEBUG_OUTPUT);
g_egl_dynProcs.glDebugMessageCallbackKHR(debugCallback, NULL); g_egl_dynProcs.glDebugMessageCallbackKHR(debugCallback, NULL);
DEBUG_INFO("Using debug message callback from GL_KHR_debug"); DEBUG_INFO("Using debug message callback from GL_KHR_debug");
} }
else else
DEBUG_INFO("Debug message callback not supported"); DEBUG_INFO("Debug message callback not supported");
}
else
DEBUG_INFO("Debug messages disabled, enable with egl:debug=true");
eglSwapInterval(this->display, this->opt.vsync ? 1 : 0); eglSwapInterval(this->display, this->opt.vsync ? 1 : 0);