[Mesa-dev] [PATCH] include/GL: fix the interop header for a --disable-glx build

2016-05-17 Thread Rob Herring
Including glx.h brings in X11 headers. Avoid the include of glx.h and just forward declare the necessary symbols. Signed-off-by: Rob Herring --- I haven't seen any progress and this and builds are still broken. Here's a fix as Emil suggested. Rob include/GL/mesa_glinterop.h | 5 - 1 file

Re: [Mesa-dev] [PATCH] include/GL: fix the interop header for a --disable-glx build

2016-04-21 Thread Emil Velikov
On 21 April 2016 at 20:10, Chuck Atkins wrote: >>> >> Drop the includes altogether, and forward declare the needed symbols. >> >> >> But then you end up with forward declarations of symbols that may not even >> exist. > > > I guess you'll already have prototypes that will remain unresolved since i

Re: [Mesa-dev] [PATCH] include/GL: fix the interop header for a --disable-glx build

2016-04-21 Thread Chuck Atkins
> > >> Drop the includes altogether, and forward declare the needed symbols. >> > > But then you end up with forward declarations of symbols that may not even > exist. > I guess you'll already have prototypes that will remain unresolved since if you're using GLX then you probably won't be linking

Re: [Mesa-dev] [PATCH] include/GL: fix the interop header for a --disable-glx build

2016-04-21 Thread Chuck Atkins
> > >> Drop the includes altogether, and forward declare the needed symbols. > But then you end up with forward declarations of symbols that may not even exist. > > Why not use the configure.ac-based approach suggested by Chuck? > > Few reasons come to mind: > > Not to mention that every user

Re: [Mesa-dev] [PATCH] include/GL: fix the interop header for a --disable-glx build

2016-04-21 Thread Emil Velikov
On 21 April 2016 at 18:44, Mircea Gherzan wrote: >>> +#ifdef MESA_EGL_NO_X11_HEADERS >>> +#include >>> +#else >>> #include >>> +#endif >>> + >>> #include >>> >> Drop the includes altogether, and forward declare the needed symbols. > > > Why not use the configure.ac-based approach suggested b

Re: [Mesa-dev] [PATCH] include/GL: fix the interop header for a --disable-glx build

2016-04-21 Thread Mircea Gherzan
On 21-Apr-16 4:08 PM, Emil Velikov wrote: On 20 April 2016 at 16:52, Mircea Gherzan wrote: This header should not blindly include the GLX and should also conditionally define functions that use GLX parameters. The MESA_EGL_NO_X11_HEADERS macro is used to check if we're building without GLX supp

Re: [Mesa-dev] [PATCH] include/GL: fix the interop header for a --disable-glx build

2016-04-21 Thread Emil Velikov
On 20 April 2016 at 16:52, Mircea Gherzan wrote: > This header should not blindly include the GLX and should also > conditionally define functions that use GLX parameters. The > MESA_EGL_NO_X11_HEADERS macro is used to check if we're building without > GLX support. > Eek, I new this will come to b

Re: [Mesa-dev] [PATCH] include/GL: fix the interop header for a --disable-glx build

2016-04-21 Thread Chuck Atkins
> > The MESA_EGL_NO_X11_HEADERS macro is used to check if we're building > without > GLX support. > In configure.ac: # If we don't have the X11 platform, set this define so we don't try to include # the X11 headers. if ! echo "$egl_platforms" | grep -q 'x11'; then DEFINES="$DEFINES -DMESA_EGL

Re: [Mesa-dev] [PATCH] include/GL: fix the interop header for a --disable-glx build

2016-04-20 Thread Mircea Gherzan
On 20-Apr-16 6:59 PM, Sinclair Yeh wrote: Minor comment below. Either way: Reviewed-by: Sinclair Yeh On Wed, Apr 20, 2016 at 05:52:17PM +0200, Mircea Gherzan wrote: This header should not blindly include the GLX and should also conditionally define functions that use GLX parameters. The MESA

Re: [Mesa-dev] [PATCH] include/GL: fix the interop header for a --disable-glx build

2016-04-20 Thread Sinclair Yeh
Minor comment below. Either way: Reviewed-by: Sinclair Yeh On Wed, Apr 20, 2016 at 05:52:17PM +0200, Mircea Gherzan wrote: > This header should not blindly include the GLX and should also > conditionally define functions that use GLX parameters. The > MESA_EGL_NO_X11_HEADERS macro is used to ch

Re: [Mesa-dev] [PATCH] include/GL: fix the interop header for a --disable-glx build

2016-04-20 Thread Marek Olšák
Reviewed-by: Marek Olšák Marek On Wed, Apr 20, 2016 at 5:52 PM, Mircea Gherzan wrote: > This header should not blindly include the GLX and should also > conditionally define functions that use GLX parameters. The > MESA_EGL_NO_X11_HEADERS macro is used to check if we're building without > GLX s

[Mesa-dev] [PATCH] include/GL: fix the interop header for a --disable-glx build

2016-04-20 Thread Mircea Gherzan
This header should not blindly include the GLX and should also conditionally define functions that use GLX parameters. The MESA_EGL_NO_X11_HEADERS macro is used to check if we're building without GLX support. Signed-off-by: Mircea Gherzan --- include/GL/mesa_glinterop.h | 37