From 47ac11bcf8bd9e4525e0fb4308d0bca87a8900c6 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 15 Jan 2018 15:38:25 +0100 Subject: [PATCH] glx: fix non-dri build MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit glXGetDriverConfig parameters do not provide a context to dynamically check for the presence of the function, so the dispatcher directly calls glXGetDriverConfig, but in non-dri builds dri_glx.c didn't provide glXGetDriverConfig. This change make it just return NULL in that case. Fixes: 84f764a7591 "glxglvnddispatch: Add missing dispatch for GetDriverConfig Reviewed-by: Nicolai Hähnle Reviewed-by: Hans de Goede Reviewed-by: Emil Velikov --- src/glx/g_glxglvnddispatchfuncs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/glx/g_glxglvnddispatchfuncs.c b/src/glx/g_glxglvnddispatchfuncs.c index 56d894eda72..5b65afc8602 100644 --- a/src/glx/g_glxglvnddispatchfuncs.c +++ b/src/glx/g_glxglvnddispatchfuncs.c @@ -338,11 +338,15 @@ static Display *dispatch_GetCurrentDisplayEXT(void) static const char *dispatch_GetDriverConfig(const char *driverName) { +#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) /* * The options are constant for a given driverName, so we do not need * a context (and apps expect to be able to call this without one). */ return glXGetDriverConfig(driverName); +#else + return NULL; +#endif } -- 2.30.2