Created attachment 123385 [details]
glxinfo output with final fix

Patched it on top of cbcd7b60f573d027337a2390e67f6010e9992aaa and that one did
actually work! I've attached the full glxinfo output in case someone is
interested.