xserver: Branch 'master'

[Adam Jackson]

 glx/glxscreens.c |    7 -------
 glx/glxserver.h  |    2 --
 2 files changed, 9 deletions(-)

New commits:
commit b06a85e7fd6ddac58dd97e5d7ce3b5ea9553c8f6
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Mon Jul 31 14:13:48 2017 +0100

    glx: remove unused GlxSetVisualConfigs stub
    
    The function was an empty since 2008 at least. Drop it since no
    drivers use it any more.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index 609661274..37929275e 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -176,13 +176,6 @@ glxGetScreen(ScreenPtr pScreen)
     return dixLookupPrivate(&pScreen->devPrivates, glxScreenPrivateKey);
 }
 
-_X_EXPORT void
-GlxSetVisualConfigs(int nconfigs, void *configs, void **privates)
-{
-    /* We keep this stub around for the DDX drivers that still
-     * call it. */
-}
-
 GLint
 glxConvertToXVisualType(int visualType)
 {
diff --git a/glx/glxserver.h b/glx/glxserver.h
index e7ea8c282..732ed9d8e 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -77,8 +77,6 @@ extern __GLXclientState *glxGetClient(ClientPtr pClient);
 
 /************************************************************************/
 
-void GlxSetVisualConfigs(int nconfigs, void *configs, void **privates);
-
 void __glXScreenInitVisuals(__GLXscreen * screen);
 
 /*