Created attachment 123283 [details] [review]
Patch

Please send patches to the mesa-dev mailing list using 'git send-email'.  Otherwise they are likely to go unnoticed.

*** Bug 95504 has been marked as a duplicate of this bug. ***

https://bugs.freedesktop.org/attachment.cgi?id=123283

The committed patch introduce 'new' compilation error, here.

make[3]: Entering directory '/opt/mesa/src/glx'
  CC       glxcmds.lo
glxcmds.c:2699:1: error: no previous prototype for 'MesaGLInteropGLXQueryDeviceInfo' [-Werror=missing-prototypes]
 MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context,
 ^
glxcmds.c:2723:1: error: no previous prototype for 'MesaGLInteropGLXExportObject' [-Werror=missing-prototypes]
 MesaGLInteropGLXExportObject(Display *dpy, GLXContext context,
 ^
cc1: some warnings being treated as errors
Makefile:845: recipe for target 'glxcmds.lo' failed
make[3]: *** [glxcmds.lo] Error 1
make[3]: Leaving directory '/opt/mesa/src/glx'
Makefile:865: recipe for target 'all-recursive' failed
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory '/opt/mesa/src/glx'
Makefile:684: recipe for target 'all-recursive' failed
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory '/opt/mesa/src'
Makefile:631: recipe for target 'all-recursive' failed
make: *** [all-recursive] Error 1

git revert 4e2c9a0

let Mesa build, again.

Created attachment 123964 [details] [review]
glx: Fix build broken by 4e2c9a04354b6b133845b8b93c0c5d34261a91d0

Attached patch from

Tom Stellard, idea from
Mark Janes

fixed it here finally, too.

This is still broken on Android builds.

I've got alternative solution that I'm rebasing atm. Keep an eye open for a dozen or so patches that brings some sense into the GL/CL interop header/implementation.

Pretty sure that the issue should be resolved with the patches that landed yesterday. Please give it a test and reopen if it's still a problem.