xserver: Branch 'master'

[GitLab Mirror]

 glamor/glamor.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b22b4da980b763af5124f26627cad93983542d6b
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Aug 14 19:19:46 2020 -0400

    glamor: Fix debugging callback setup on GLES
    
    You will not find GL_ARB_* extensions in a GLES context by definition,
    the droid you're looking for is named GL_KHR_debug.
    
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>

diff --git a/glamor/glamor.c b/glamor/glamor.c
index a11e2212d..3baef4b9f 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -423,7 +423,8 @@ glamor_debug_output_callback(GLenum source,
 static void
 glamor_setup_debug_output(ScreenPtr screen)
 {
-    if (!epoxy_has_gl_extension("GL_ARB_debug_output"))
+    if (!epoxy_has_gl_extension("GL_KHR_debug") &&
+        !epoxy_has_gl_extension("GL_ARB_debug_output"))
         return;
 
     glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);