Mesa (master): Use C99 NAN and INFINITY macros
Matt Turner
mattst88 at kemper.freedesktop.org
Fri Aug 3 22:01:24 UTC 2012
Module: Mesa
Branch: master
Commit: fb85558ab1e40698bfb1aedaaf32b182560f2479
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb85558ab1e40698bfb1aedaaf32b182560f2479
Author: Matt Turner <mattst88 at gmail.com>
Date: Wed Aug 1 14:48:47 2012 -0700
Use C99 NAN and INFINITY macros
---
src/gallium/auxiliary/util/u_format_tests.c | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_format_tests.c b/src/gallium/auxiliary/util/u_format_tests.c
index d348608..26e7acb 100644
--- a/src/gallium/auxiliary/util/u_format_tests.c
+++ b/src/gallium/auxiliary/util/u_format_tests.c
@@ -26,6 +26,7 @@
**************************************************************************/
+#include <math.h>
#include <float.h>
#include "pipe/p_config.h"
@@ -66,14 +67,6 @@
{{ 0, 0, 0, 0}, { 0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}}}
-#ifdef __GNUC__
-#define NAN __builtin_nan("")
-#define INF __builtin_inf()
-#else
-#define NAN (0.0 / 0.0)
-#define INF (1.0 / 0.0)
-#endif
-
/**
* Test cases.
*
@@ -911,8 +904,8 @@ util_format_test_cases[] =
{PIPE_FORMAT_R16_FLOAT, PACKED_1x16(0xffff), PACKED_1x16(0xffff), UNPACKED_1x1( -NAN, 0.0, 0.0, 1.0)},
/* Inf */
- {PIPE_FORMAT_R16_FLOAT, PACKED_1x16(0xffff), PACKED_1x16(0x7c00), UNPACKED_1x1( INF, 0.0, 0.0, 1.0)},
- {PIPE_FORMAT_R16_FLOAT, PACKED_1x16(0xffff), PACKED_1x16(0xfc00), UNPACKED_1x1( -INF, 0.0, 0.0, 1.0)},
+ {PIPE_FORMAT_R16_FLOAT, PACKED_1x16(0xffff), PACKED_1x16(0x7c00), UNPACKED_1x1( INFINITY, 0.0, 0.0, 1.0)},
+ {PIPE_FORMAT_R16_FLOAT, PACKED_1x16(0xffff), PACKED_1x16(0xfc00), UNPACKED_1x1( -INFINITY, 0.0, 0.0, 1.0)},
#endif
More information about the mesa-commit
mailing list