Mac OS fixes for texturing tests

Include GLUT/glut.h instead of GL/glut.h on Mac OS. With this patch, all
the texturing tests except for tfp compile and run on Mac OS.

10 files changed, 40 insertions, 0 deletions

diff --git a/tests/texturing/copytexsubimage.c b/tests/texturing/copytexsubimage.c
index 83d3b164..20670112 100644
--- a/tests/texturing/copytexsubimage.c
+++ b/tests/texturing/copytexsubimage.c
@@ -25,7 +25,11 @@
  *
  */
 
+#if defined(__APPLE__)
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/texturing/cubemap.c b/tests/texturing/cubemap.c
index 983cb8b6..c381f772 100644
--- a/tests/texturing/cubemap.c
+++ b/tests/texturing/cubemap.c
@@ -25,7 +25,11 @@
  *
  */
 
+#if defined(__APPLE__)
+#include <GLUT/glut.h>
+#else
 #include "GL/glut.h"
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/texturing/gen-teximage.c b/tests/texturing/gen-teximage.c
index 32f330a3..2a9607f0 100644
--- a/tests/texturing/gen-teximage.c
+++ b/tests/texturing/gen-teximage.c
@@ -36,7 +36,11 @@
  *   existing texture.
  */
 
+#if defined(__APPLE__)
+#include <GLUT/glut.h>
+#else
 #include "GL/glut.h"
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/texturing/gen-texsubimage.c b/tests/texturing/gen-texsubimage.c
index 5626862e..a3cfaac7 100644
--- a/tests/texturing/gen-texsubimage.c
+++ b/tests/texturing/gen-texsubimage.c
@@ -33,7 +33,11 @@
  * in bug #17077.
  */
 
+#if defined(__APPLE__)
+#include <GLUT/glut.h>
+#else
 #include "GL/glut.h"
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/texturing/getteximage-simple.c b/tests/texturing/getteximage-simple.c
index d2e823e0..98acf3be 100644
--- a/tests/texturing/getteximage-simple.c
+++ b/tests/texturing/getteximage-simple.c
@@ -10,7 +10,11 @@
  * This used to crash for R300+bufmgr.
  */
 
+#if defined(__APPLE__)
+#include <GLUT/glut.h>
+#else
 #include "GL/glut.h"
+#endif
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/tests/texturing/lodbias.c b/tests/texturing/lodbias.c
index 87390ff4..42020b2f 100644
--- a/tests/texturing/lodbias.c
+++ b/tests/texturing/lodbias.c
@@ -45,7 +45,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#if defined(__APPLE__)
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 
 #include "piglit-util.h"
 
diff --git a/tests/texturing/tex3d.c b/tests/texturing/tex3d.c
index 1d108472..71af6e5a 100644
--- a/tests/texturing/tex3d.c
+++ b/tests/texturing/tex3d.c
@@ -31,7 +31,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#if defined(__APPLE__)
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 
 #include "piglit-util.h"
 
diff --git a/tests/texturing/texdepth.c b/tests/texturing/texdepth.c
index f8ab4c9a..594f648a 100644
--- a/tests/texturing/texdepth.c
+++ b/tests/texturing/texdepth.c
@@ -10,7 +10,11 @@
 
 #define GL_GLEXT_PROTOTYPES
 
+#if defined(__APPLE__)
+#include <GLUT/glut.h>
+#else
 #include "GL/glut.h"
+#endif
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/tests/texturing/texrect-many.c b/tests/texturing/texrect-many.c
index 9d898e3c..545bc13b 100644
--- a/tests/texturing/texrect-many.c
+++ b/tests/texturing/texrect-many.c
@@ -8,7 +8,11 @@
 
 #define GL_GLEXT_PROTOTYPES
 
+#if defined(__APPLE__)
+#include <GLUT/glut.h>
+#else
 #include "GL/glut.h"
+#endif
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/tests/texturing/texredefine.c b/tests/texturing/texredefine.c
index 7d2334a7..5b549ed9 100644
--- a/tests/texturing/texredefine.c
+++ b/tests/texturing/texredefine.c
@@ -33,7 +33,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#if defined(__APPLE__)
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 
 #include "piglit-util.h"