summaryrefslogtreecommitdiff
path: root/glamor/glamor.c
diff options
context:
space:
mode:
Diffstat (limited to 'glamor/glamor.c')
-rw-r--r--glamor/glamor.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/glamor/glamor.c b/glamor/glamor.c
index d4a023629..f2aec4607 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -379,6 +379,13 @@ glamor_debug_output_callback(GLenum source,
const void *userParam)
{
ScreenPtr screen = (void *)userParam;
+ glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
+
+ if (glamor_priv->suppress_gl_out_of_memory_logging &&
+ source == GL_DEBUG_SOURCE_API && type == GL_DEBUG_TYPE_ERROR) {
+ return;
+ }
+
LogMessageVerb(X_ERROR, 0, "glamor%d: GL error: %*s\n",
screen->myNum, length, message);
}
@@ -394,6 +401,9 @@ glamor_setup_debug_output(ScreenPtr screen)
return;
glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+ /* Disable debugging messages other than GL API errors */
+ glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL,
+ GL_FALSE);
glDebugMessageControl(GL_DEBUG_SOURCE_API,
GL_DEBUG_TYPE_ERROR,
GL_DONT_CARE,