On Sun, Aug 17, 2014 at 5:32 PM, Daniel Kurtz <djku...@chromium.org> wrote: > > On Aug 18, 2014 3:49 AM, "Kristian Høgsberg" <k...@bitplanet.net> wrote: >> >> On Sun, Aug 17, 2014 at 7:19 AM, Ken Phillis Jr <kphilli...@gmail.com> >> wrote: >> > This patch looks good to me. >> > >> > On Aug 17, 2014 7:39 AM, "Daniel Kurtz" <djku...@chromium.org> wrote: >> >> >> >> EGL util should not in any way depend on the headers of a particular >> >> client library. >> >> >> >> In fact, this breaks compilation on pure OpenGL ES systems, since they >> >> do not have OpenGL headers installed (<GL/gl.h>). >> >> >> >> Signed-off-by: Daniel Kurtz <djku...@chromium.org> >> >> --- >> >> I've test built this change on two different systems with EGL/OpenGL >> >> ES-only >> >> (ARM Mali and Nvidia Tegra). >> >> >> >> I have not built on a system with EGL + OpenGL, or mixed GL/GLES... >> >> does >> >> anybody have a system like that and can double check? >> >> It certainly shouldn't be in the header, but egl-util.c needs it and >> breaks if you remove it. > > egl-util.c builds fine for GLES without <GL/gl.h> (and breaks with it). Why > is it needed for GL? What am I missing?
I got compile errors that looked like a missing Xlib.h include, not gl.h. Trying again it was just Xlib deprecation warnings, and they're there without your patch. Sorry for the false alarm. Reviewed-by: Kristian Høgsberg <k...@bitplanet.net> >> Kristian >> >> >> >> >> Also, I do not have commit access, so can someone please submit this >> >> for >> >> me if >> >> it looks good? >> >> >> >> Thanks, >> >> -djk >> >> >> >> tests/egl/egl-util.h | 1 - >> >> 1 file changed, 1 deletion(-) >> >> >> >> diff --git a/tests/egl/egl-util.h b/tests/egl/egl-util.h >> >> index f5c74fd..27d2926 100644 >> >> --- a/tests/egl/egl-util.h >> >> +++ b/tests/egl/egl-util.h >> >> @@ -12,7 +12,6 @@ >> >> #include <X11/Xlib.h> >> >> #include <X11/Xutil.h> >> >> #include <X11/keysym.h> >> >> -#include <GL/gl.h> >> >> #include <EGL/egl.h> >> >> #include <EGL/eglext.h> >> >> >> >> -- >> >> 2.1.0.rc2.206.gedb03e5 >> >> >> >> _______________________________________________ >> >> Piglit mailing list >> >> Piglit@lists.freedesktop.org >> >> http://lists.freedesktop.org/mailman/listinfo/piglit _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit