glx: keep glvnd_vendor a private [static] variable

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Emil Velikov 2018-02-19 15:18:07 +00:00 committed by Adam Jackson
parent a054532668
commit 1310241e8d

View File

@ -497,11 +497,11 @@ xorgGlxServerPreInit(const ExtensionEntry *extEntry)
return glxGeneration == serverGeneration;
}
static GlxServerVendor *glvnd_vendor = NULL;
static GlxServerVendor *
xorgGlxInitGLVNDVendor(void)
{
static GlxServerVendor *glvnd_vendor = NULL;
if (glvnd_vendor == NULL) {
GlxServerImports *imports = NULL;
imports = glxServer.allocateServerImports();
@ -521,6 +521,7 @@ xorgGlxInitGLVNDVendor(void)
static void
xorgGlxServerInit(CallbackListPtr *pcbl, void *param, void *ext)
{
GlxServerVendor *glvnd_vendor;
const ExtensionEntry *extEntry = ext;
int i;
@ -528,7 +529,8 @@ xorgGlxServerInit(CallbackListPtr *pcbl, void *param, void *ext)
return;
}
if (!xorgGlxInitGLVNDVendor()) {
glvnd_vendor = xorgGlxInitGLVNDVendor();
if (!glvnd_vendor) {
return;
}