[Piglit] [PATCH] Fix glu.h inclusions on Mac OS X.

Brian Paul brianp at vmware.com
Mon Oct 29 07:43:02 PDT 2012


On 10/27/2012 02:55 PM, Vinson Lee wrote:
> This patch fixes build failures on Mac OS X since commit
> 68de5fb435e6e1cb0caedddff0fd0a9c221b0005.
>
> Signed-off-by: Vinson Lee<vlee at freedesktop.org>
> ---
>   tests/shaders/fp-fragment-position.c                  | 4 ++++
>   tests/spec/arb_shader_texture_lod/execution/texgrad.c | 4 ++++
>   tests/spec/gl-2.0/api/clip-flag-behavior.c            | 4 ++++
>   3 files changed, 12 insertions(+)
>
> diff --git a/tests/shaders/fp-fragment-position.c b/tests/shaders/fp-fragment-position.c
> index 7ccd6ee..e8c7421 100644
> --- a/tests/shaders/fp-fragment-position.c
> +++ b/tests/shaders/fp-fragment-position.c
> @@ -26,7 +26,11 @@
>    */
>
>   #include "piglit-util-gl-common.h"
> +#ifdef __APPLE__
> +#include<OpenGL/glu.h>
> +#else
>   #include<GL/glu.h>
> +#endif
>
>   PIGLIT_GL_TEST_CONFIG_BEGIN
>
> diff --git a/tests/spec/arb_shader_texture_lod/execution/texgrad.c b/tests/spec/arb_shader_texture_lod/execution/texgrad.c
> index 0f3761f..9fdd7f3 100644
> --- a/tests/spec/arb_shader_texture_lod/execution/texgrad.c
> +++ b/tests/spec/arb_shader_texture_lod/execution/texgrad.c
> @@ -30,7 +30,11 @@
>    */
>
>   #include "piglit-util-gl-common.h"
> +#ifdef __APPLE__
> +#include<OpenGL/glu.h>
> +#else
>   #include<GL/glu.h>
> +#endif
>
>   PIGLIT_GL_TEST_CONFIG_BEGIN
>
> diff --git a/tests/spec/gl-2.0/api/clip-flag-behavior.c b/tests/spec/gl-2.0/api/clip-flag-behavior.c
> index ecc8328..4c3336f 100644
> --- a/tests/spec/gl-2.0/api/clip-flag-behavior.c
> +++ b/tests/spec/gl-2.0/api/clip-flag-behavior.c
> @@ -37,7 +37,11 @@
>    */
>
>   #include "piglit-util-gl-common.h"
> +#ifdef __APPLE__
> +#include<OpenGL/glu.h>
> +#else
>   #include<GL/glu.h>
> +#endif
>
>   PIGLIT_GL_TEST_CONFIG_BEGIN
>

This is OK for now but we could probably remove the dependencies on 
libGLU pretty easily.  Let me take a stab at that...

-Brian


More information about the Piglit mailing list