[Piglit] [PATCH 2/5] Rename MAX to MAX2 in texunits.c.

Paul Berry stereotype441 at gmail.com
Wed Jan 25 17:56:45 PST 2012


texunits.c, like many other files in Piglit, defines a macro for
selecting the maximum of two arguments.  In all other cases, the macro
is called MAX2().  This patch renames the macro in texunits.c to be
consistent with all of the other definitions.
---
 tests/general/texunits.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/general/texunits.c b/tests/general/texunits.c
index 4c1827b..72351e6 100644
--- a/tests/general/texunits.c
+++ b/tests/general/texunits.c
@@ -31,7 +31,7 @@
 #include "piglit-util.h"
 
 
-#define MAX( A, B )   ( (A)>(B) ? (A) : (B) )
+#define MAX2( A, B )   ( (A)>(B) ? (A) : (B) )
 
 
 static int Width = 128, Height = 128;
@@ -267,7 +267,7 @@ test_texture_params(void)
       printf("Unexpected GL error in %s(): 0x%x\n", __FUNCTION__, err);
    }
 
-   maxUnit = MAX(MaxTextureCombinedUnits, MaxTextureCoordUnits);
+   maxUnit = MAX2(MaxTextureCombinedUnits, MaxTextureCoordUnits);
 
    /* this should generate an error */
    glActiveTexture(GL_TEXTURE0 + maxUnit);
-- 
1.7.7.6



More information about the Piglit mailing list