diff --git a/src/glx_context.c b/src/glx_context.c
index 96e706d1a..546321826 100644
--- a/src/glx_context.c
+++ b/src/glx_context.c
@@ -120,9 +120,9 @@ selectionloop:
 	    XFree( visualinfo );
         }
 
-        u->redBits = getFBConfigAttrib(n, GLX_RED_SIZE);
-        u->greenBits = getFBConfigAttrib(n, GLX_GREEN_SIZE);
-        u->blueBits = getFBConfigAttrib(n, GLX_BLUE_SIZE);
+        u->redBits = getGLXFBConfigAttrib(n, GLX_RED_SIZE);
+        u->greenBits = getGLXFBConfigAttrib(n, GLX_GREEN_SIZE);
+        u->blueBits = getGLXFBConfigAttrib(n, GLX_BLUE_SIZE);
 
         u->alphaBits = getGLXFBConfigAttrib(n, GLX_ALPHA_SIZE);
         u->depthBits = getGLXFBConfigAttrib(n, GLX_DEPTH_SIZE);
diff --git a/src/x11_init.c b/src/x11_init.c
index 0597a9162..ee25adc20 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -480,7 +480,8 @@ static GLFWbool initExtensions(void)
     }
 
     _glfw.x11.xi.handle = dlopen("libXi.so.6", RTLD_LAZY | RTLD_GLOBAL);
-	if (_glfw.x11.xi.handle)
+
+    if (_glfw.x11.xi.handle)
     {
         _glfw.x11.xi.QueryVersion = (PFN_XIQueryVersion)
             dlsym(_glfw.x11.xi.handle, "XIQueryVersion");
@@ -505,72 +506,68 @@ static GLFWbool initExtensions(void)
         }
     }
 
-	// Check for RandR extension
-	if (XRRQueryExtension(_glfw.x11.display,
-		&_glfw.x11.randr.eventBase,
-		&_glfw.x11.randr.errorBase)) {
+    // Check for RandR extension
+    _glfw.x11.randr.handle = dlopen("libXrandr.so.2", RTLD_LAZY | RTLD_GLOBAL);
 
-		_glfw.x11.randr.handle = dlopen("libXrandr.so.2", RTLD_LAZY | RTLD_GLOBAL);
-	
-		if (_glfw.x11.randr.handle)
-		{
-			_glfw.x11.randr.AllocGamma = (PFN_XRRAllocGamma)
-				dlsym(_glfw.x11.randr.handle, "XRRAllocGamma");
-			_glfw.x11.randr.FreeGamma = (PFN_XRRFreeGamma)
-				dlsym(_glfw.x11.randr.handle, "XRRFreeGamma");
-			_glfw.x11.randr.FreeCrtcInfo = (PFN_XRRFreeCrtcInfo)
-				dlsym(_glfw.x11.randr.handle, "XRRFreeCrtcInfo");
-			_glfw.x11.randr.FreeGamma = (PFN_XRRFreeGamma)
-				dlsym(_glfw.x11.randr.handle, "XRRFreeGamma");
-			_glfw.x11.randr.FreeOutputInfo = (PFN_XRRFreeOutputInfo)
-				dlsym(_glfw.x11.randr.handle, "XRRFreeOutputInfo");
-			_glfw.x11.randr.FreeScreenResources = (PFN_XRRFreeScreenResources)
-				dlsym(_glfw.x11.randr.handle, "XRRFreeScreenResources");
-			_glfw.x11.randr.GetCrtcGamma = (PFN_XRRGetCrtcGamma)
-				dlsym(_glfw.x11.randr.handle, "XRRGetCrtcGamma");
-			_glfw.x11.randr.GetCrtcGammaSize = (PFN_XRRGetCrtcGammaSize)
-				dlsym(_glfw.x11.randr.handle, "XRRGetCrtcGammaSize");
-			_glfw.x11.randr.GetCrtcInfo = (PFN_XRRGetCrtcInfo)
-				dlsym(_glfw.x11.randr.handle, "XRRGetCrtcInfo");
-			_glfw.x11.randr.GetOutputInfo = (PFN_XRRGetOutputInfo)
-				dlsym(_glfw.x11.randr.handle, "XRRGetOutputInfo");
-			_glfw.x11.randr.GetOutputPrimary = (PFN_XRRGetOutputPrimary)
-				dlsym(_glfw.x11.randr.handle, "XRRGetOutputPrimary");
-			_glfw.x11.randr.GetScreenResourcesCurrent = (PFN_XRRGetScreenResourcesCurrent)
-				dlsym(_glfw.x11.randr.handle, "XRRGetScreenResourcesCurrent");
-			_glfw.x11.randr.QueryExtension = (PFN_XRRQueryExtension)
-				dlsym(_glfw.x11.randr.handle, "XRRQueryExtension");
-			_glfw.x11.randr.QueryVersion = (PFN_XRRQueryVersion)
-				dlsym(_glfw.x11.randr.handle, "XRRQueryVersion");
-			_glfw.x11.randr.SelectInput = (PFN_XRRSelectInput)
-				dlsym(_glfw.x11.randr.handle, "XRRSelectInput");
-			_glfw.x11.randr.SetCrtcConfig = (PFN_XRRSetCrtcConfig)
-				dlsym(_glfw.x11.randr.handle, "XRRSetCrtcConfig");
-			_glfw.x11.randr.SetCrtcGamma = (PFN_XRRSetCrtcGamma)
-				dlsym(_glfw.x11.randr.handle, "XRRSetCrtcGamma");
-			_glfw.x11.randr.UpdateConfiguration = (PFN_XRRUpdateConfiguration)
-				dlsym(_glfw.x11.randr.handle, "XRRUpdateConfiguration");
+    if (_glfw.x11.randr.handle)
+    {
+        _glfw.x11.randr.AllocGamma = (PFN_XRRAllocGamma)
+            dlsym(_glfw.x11.randr.handle, "XRRAllocGamma");
+        _glfw.x11.randr.FreeGamma = (PFN_XRRFreeGamma)
+            dlsym(_glfw.x11.randr.handle, "XRRFreeGamma");
+        _glfw.x11.randr.FreeCrtcInfo = (PFN_XRRFreeCrtcInfo)
+            dlsym(_glfw.x11.randr.handle, "XRRFreeCrtcInfo");
+        _glfw.x11.randr.FreeGamma = (PFN_XRRFreeGamma)
+            dlsym(_glfw.x11.randr.handle, "XRRFreeGamma");
+        _glfw.x11.randr.FreeOutputInfo = (PFN_XRRFreeOutputInfo)
+            dlsym(_glfw.x11.randr.handle, "XRRFreeOutputInfo");
+        _glfw.x11.randr.FreeScreenResources = (PFN_XRRFreeScreenResources)
+            dlsym(_glfw.x11.randr.handle, "XRRFreeScreenResources");
+        _glfw.x11.randr.GetCrtcGamma = (PFN_XRRGetCrtcGamma)
+            dlsym(_glfw.x11.randr.handle, "XRRGetCrtcGamma");
+        _glfw.x11.randr.GetCrtcGammaSize = (PFN_XRRGetCrtcGammaSize)
+            dlsym(_glfw.x11.randr.handle, "XRRGetCrtcGammaSize");
+        _glfw.x11.randr.GetCrtcInfo = (PFN_XRRGetCrtcInfo)
+            dlsym(_glfw.x11.randr.handle, "XRRGetCrtcInfo");
+        _glfw.x11.randr.GetOutputInfo = (PFN_XRRGetOutputInfo)
+            dlsym(_glfw.x11.randr.handle, "XRRGetOutputInfo");
+        _glfw.x11.randr.GetOutputPrimary = (PFN_XRRGetOutputPrimary)
+            dlsym(_glfw.x11.randr.handle, "XRRGetOutputPrimary");
+        _glfw.x11.randr.GetScreenResourcesCurrent = (PFN_XRRGetScreenResourcesCurrent)
+            dlsym(_glfw.x11.randr.handle, "XRRGetScreenResourcesCurrent");
+        _glfw.x11.randr.QueryExtension = (PFN_XRRQueryExtension)
+            dlsym(_glfw.x11.randr.handle, "XRRQueryExtension");
+        _glfw.x11.randr.QueryVersion = (PFN_XRRQueryVersion)
+            dlsym(_glfw.x11.randr.handle, "XRRQueryVersion");
+        _glfw.x11.randr.SelectInput = (PFN_XRRSelectInput)
+            dlsym(_glfw.x11.randr.handle, "XRRSelectInput");
+        _glfw.x11.randr.SetCrtcConfig = (PFN_XRRSetCrtcConfig)
+            dlsym(_glfw.x11.randr.handle, "XRRSetCrtcConfig");
+        _glfw.x11.randr.SetCrtcGamma = (PFN_XRRSetCrtcGamma)
+            dlsym(_glfw.x11.randr.handle, "XRRSetCrtcGamma");
+        _glfw.x11.randr.UpdateConfiguration = (PFN_XRRUpdateConfiguration)
+            dlsym(_glfw.x11.randr.handle, "XRRUpdateConfiguration");
+
+        if (XRRQueryExtension(_glfw.x11.display,
+                              &_glfw.x11.randr.eventBase,
+                              &_glfw.x11.randr.errorBase))
+        {
+            if (XRRQueryVersion(_glfw.x11.display,
+                                &_glfw.x11.randr.major,
+                                &_glfw.x11.randr.minor))
+            {
+                // The GLFW RandR path requires at least version 1.3
+                if (_glfw.x11.randr.major > 1 || _glfw.x11.randr.minor >= 3)
+                    _glfw.x11.randr.available = GLFW_TRUE;
+            }
+            else
+            {
+                _glfwInputError(GLFW_PLATFORM_ERROR,
+                                "X11: Failed to query RandR version");
+            }
+        }
+    }
 
-			if (XRRQueryExtension(_glfw.x11.display,
-								  &_glfw.x11.randr.eventBase,
-								  &_glfw.x11.randr.errorBase))
-			{
-				if (XRRQueryVersion(_glfw.x11.display,
-									&_glfw.x11.randr.major,
-									&_glfw.x11.randr.minor))
-				{
-					// The GLFW RandR path requires at least version 1.3
-					if (_glfw.x11.randr.major > 1 || _glfw.x11.randr.minor >= 3)
-						_glfw.x11.randr.available = GLFW_TRUE;
-				}
-				else
-				{
-					_glfwInputError(GLFW_PLATFORM_ERROR,
-									"X11: Failed to query RandR version");
-				}
-			}
-		}
-	}
     if (_glfw.x11.randr.available)
     {
         XRRScreenResources* sr = XRRGetScreenResourcesCurrent(_glfw.x11.display,
@@ -1056,4 +1053,3 @@ const char* _glfwPlatformGetVersionString(void)
 #endif
         ;
 }
-
diff --git a/src/x11_window.c b/src/x11_window.c
index cdc57e736..759435c34 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -1808,14 +1808,14 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
         {
             if (!_glfwInitGLX())
                 return GLFW_FALSE;
-            if (!_glfwChooseVisualGLX(ctxconfig, fbconfig, &visual, &depth))
+            if (!_glfwChooseVisualGLX(wndconfig, ctxconfig, fbconfig, &visual, &depth))
                 return GLFW_FALSE;
         }
         else if (ctxconfig->source == GLFW_EGL_CONTEXT_API)
         {
             if (!_glfwInitEGL())
                 return GLFW_FALSE;
-            if (!_glfwChooseVisualEGL(ctxconfig, fbconfig, &visual, &depth))
+            if (!_glfwChooseVisualEGL(wndconfig, ctxconfig, fbconfig, &visual, &depth))
                 return GLFW_FALSE;
         }
         else if (ctxconfig->source == GLFW_OSMESA_CONTEXT_API)