[Piglit] [PATCH v2 10/13] piglit-dispatch: Switch to using piglit-dispatch instead of GLEW.

[Paul Berry]

On 16 March 2012 11:52, Chad Versace <chad.versace at linux.intel.com> wrote:

> On 03/12/2012 02:41 PM, Paul Berry wrote:
> > Previous patches set up the piglit-dispatch infrastructure but did not
> > use it.  This patch enables piglit-dispatch and uses it instead of
> > GLEW.
> >
> > No piglit regressions on Intel SandyBridge (Linux) or Mac OSX.
>
> Nice. Only one more platform to conquer.
>
> >  #if defined(USE_OPENGL)
> > -#    include "glew.h"
> > -     /* Include the real headers too, in case GLEW misses something. */
> > +#    include "piglit-dispatch.h"
> > +     /* Include the real headers too, in case piglit-dispatch misses
> something. */
> >  #    ifdef __APPLE__
> >  #            include <OpenGL/gl.h>
> >  #            include <OpenGL/glu.h>
>
> Shouldn't Apple's <OpenGL/gl.h> be removed too?
> I think we discussed this before, but I don't remember the conclusion.
>

Yes, you're right.  In fact this whole block should be removed:

    /* Include the real headers too, in case piglit-dispatch misses
something. */
#    ifdef __APPLE__
#        include <OpenGL/gl.h>
#        include <OpenGL/glu.h>
#        include <OpenGL/glext.h>
#    else
#        include <GL/gl.h>
#        include <GL/glu.h>
#        include <GL/glext.h>
#    endif

I'll update the patch.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20120316/494cdcaa/attachment-0001.htm>