mesa: remove MAX_GLUSHORT, move MAX_GLUINT

The later is only used in one place in swrast.

Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 82b3213dd906230fb921ad481d1a3c3a0be2addf..356f0e1837645cf0c2f3c043fbbe3bb6035e4b8c 100644 (file)
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -83,9 +83,6 @@ typedef union { GLfloat f; GLint i; GLuint u; } fi_type;
  * Math macros
  */
 
-#define MAX_GLUSHORT   0xffff
-#define MAX_GLUINT     0xffffffff
-
 /* Degrees to radians conversion: */
 #define DEG2RAD (M_PI/180.0)
 

diff --git a/src/mesa/swrast/s_tritemp.h b/src/mesa/swrast/s_tritemp.h
index f0281e4568b950b4aaa62e13e23b596947167f63..fb73b2d59ffcfd555f37d7c6d7883f9efe2ec0a9 100644 (file)
--- a/src/mesa/swrast/s_tritemp.h
+++ b/src/mesa/swrast/s_tritemp.h
@@ -91,6 +91,11 @@
  */
 
 
+#ifndef MAX_GLUINT
+#define MAX_GLUINT     0xffffffff
+#endif
+
+
 /*
  * Some code we unfortunately need to prevent negative interpolated colors.
  */