diff options
| author | Brian Paul <[email protected]> | 2015-02-24 15:23:22 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2015-02-24 17:10:28 -0700 |
| commit | ab68219a59c128e018ba68a287228c24890b8f4f (patch) | |
| tree | 0355694a27c71aff74babc72dd83ebeeef40d0a9 | |
| parent | f847ddb64dfe7d0e84354b30b7551d83fe3463c9 (diff) | |
mesa: remove MAX_GLUSHORT, move MAX_GLUINT
The later is only used in one place in swrast.
Reviewed-by: Matt Turner <[email protected]>
| -rw-r--r-- | src/mesa/main/imports.h | 3 | ||||
| -rw-r--r-- | src/mesa/swrast/s_tritemp.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index 82b3213dd90..356f0e18376 100644 --- 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 f0281e4568b..fb73b2d59ff 100644 --- 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. */ |