Mesa (master): glx: set the loader_logger early and for everyone

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: b699d070a6de273fb3a964e05944b203d0b57090
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b699d070a6de273fb3a964e05944b203d0b57090

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Mar  4 17:52:04 2020 +0000

glx: set the loader_logger early and for everyone

Currently we set the logger only for DRI3. Even though it's used nearly
everywhere. For platforms where we don't the function is effectively a
no-op.

With this in place, LIBGL_DEBUG=verbose works across the board.

Fixes: d971a4230d5 ("loader: Factor out the common driver opening logic from each loader.")
Cc: Eric Anholt <eric at anholt.net>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4084>

---

 src/glx/dri3_glx.c | 2 --
 src/glx/glxext.c   | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index 4664733c655..a0929316778 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -1105,8 +1105,6 @@ dri3_create_display(Display * dpy)
    pdp->base.destroyDisplay = dri3_destroy_display;
    pdp->base.createScreen = dri3_create_screen;
 
-   loader_set_logger(dri_message);
-
    pdp->loader_extensions = loader_extensions;
 
    return &pdp->base;
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 59434431006..cbc59e80921 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -50,6 +50,7 @@
 #include "glxextensions.h"
 
 #include "util/debug.h"
+#include "dri_common.h"
 
 #include <X11/Xlib-xcb.h>
 #include <xcb/xcb.h>
@@ -907,6 +908,9 @@ __glXInitialize(Display * dpy)
 
    dpyPriv->drawHash = __glxHashCreate();
 
+   /* Set the logger before the *CreateDisplay functions. */
+   loader_set_logger(dri_message);
+
    /*
     ** Initialize the direct rendering per display data and functions.
     ** Note: This _must_ be done before calling any other DRI routines