From 18246ed06a1e5d826fae45c5f005926207b6ed3a Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 1 Jun 2022 14:46:46 +0200 Subject: [PATCH] include: drop c99_math.h Since we now depend on C11, we know that we have support for the C99 math functionality. So let's drop the c99_math.h compatibility wrapper, and just include directly. Reviewed-by: Jesse Natalie Reviewed-by: Alyssa Rosenzweig Reviewed-by: Eric Engestrom Part-of: --- include/c99_math.h | 210 ------------------------------- src/compiler/glsl/lower_instructions.cpp | 3 +- src/compiler/nir/nir_lower_double_ops.c | 2 +- src/mesa/main/light.c | 2 +- src/mesa/main/pixel.c | 2 +- src/mesa/main/querymatrix.c | 3 +- src/mesa/math/m_debug_norm.c | 2 +- src/mesa/math/m_debug_util.h | 2 +- src/mesa/math/m_matrix.c | 2 +- src/util/format_rgb9e5.h | 3 +- src/util/rounding.h | 3 +- src/util/u_math.h | 2 +- 12 files changed, 13 insertions(+), 223 deletions(-) delete mode 100644 include/c99_math.h diff --git a/include/c99_math.h b/include/c99_math.h deleted file mode 100644 index 439a27f..0000000 --- a/include/c99_math.h +++ /dev/null @@ -1,210 +0,0 @@ -/************************************************************************** - * - * Copyright 2007-2015 VMware, Inc. - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR - * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - **************************************************************************/ - -/** - * Wrapper for math.h which makes sure we have definitions of all the c99 - * functions. - */ - - -#ifndef _C99_MATH_H_ -#define _C99_MATH_H_ - -#include - - -/* This is to ensure that we get M_PI, etc. definitions */ -#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES) -#error _USE_MATH_DEFINES define required when building with MSVC -#endif - - -#if !defined(_MSC_VER) && \ - __STDC_VERSION__ < 199901L && \ - (!defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < 600) && \ - !defined(__cplusplus) - -static inline long int -lrint(double d) -{ - long int rounded = (long int)(d + 0.5); - - if (d - floor(d) == 0.5) { - if (rounded % 2 != 0) - rounded += (d > 0) ? -1 : 1; - } - - return rounded; -} - -static inline long int -lrintf(float f) -{ - long int rounded = (long int)(f + 0.5f); - - if (f - floorf(f) == 0.5f) { - if (rounded % 2 != 0) - rounded += (f > 0) ? -1 : 1; - } - - return rounded; -} - -static inline long long int -llrint(double d) -{ - long long int rounded = (long long int)(d + 0.5); - - if (d - floor(d) == 0.5) { - if (rounded % 2 != 0) - rounded += (d > 0) ? -1 : 1; - } - - return rounded; -} - -static inline long long int -llrintf(float f) -{ - long long int rounded = (long long int)(f + 0.5f); - - if (f - floorf(f) == 0.5f) { - if (rounded % 2 != 0) - rounded += (f > 0) ? -1 : 1; - } - - return rounded; -} - -static inline float -exp2f(float f) -{ - return powf(2.0f, f); -} - -static inline double -exp2(double d) -{ - return pow(2.0, d); -} - -#endif /* C99 */ - - -/* - * signbit() is a macro on Linux. Not available on Windows. - */ -#ifndef signbit -#define signbit(x) ((x) < 0.0f) -#endif - - -#ifndef M_PI -#define M_PI (3.14159265358979323846) -#endif - -#ifndef M_E -#define M_E (2.7182818284590452354) -#endif - -#ifndef M_LOG2E -#define M_LOG2E (1.4426950408889634074) -#endif - -#ifndef FLT_MAX_EXP -#define FLT_MAX_EXP 128 -#endif - - -#if defined(fpclassify) -/* ISO C99 says that fpclassify is a macro. Assume that any implementation - * of fpclassify, whether it's in a C99 compiler or not, will be a macro. - */ -#elif defined(__cplusplus) -/* For C++, fpclassify() should be defined in */ -#elif defined(_MSC_VER) -/* Not required on VS2013 and above. Oddly, the fpclassify() function - * doesn't exist in such a form on MSVC. This is an implementation using - * slightly different lower-level Windows functions. - */ -#include - -static inline enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL} -fpclassify(double x) -{ - switch(_fpclass(x)) { - case _FPCLASS_SNAN: /* signaling NaN */ - case _FPCLASS_QNAN: /* quiet NaN */ - return FP_NAN; - case _FPCLASS_NINF: /* negative infinity */ - case _FPCLASS_PINF: /* positive infinity */ - return FP_INFINITE; - case _FPCLASS_NN: /* negative normal */ - case _FPCLASS_PN: /* positive normal */ - return FP_NORMAL; - case _FPCLASS_ND: /* negative denormalized */ - case _FPCLASS_PD: /* positive denormalized */ - return FP_SUBNORMAL; - case _FPCLASS_NZ: /* negative zero */ - case _FPCLASS_PZ: /* positive zero */ - return FP_ZERO; - default: - /* Should never get here; but if we do, this will guarantee - * that the pattern is not treated like a number. - */ - return FP_NAN; - } -} -#else -#error "Need to include or define an fpclassify function" -#endif - - -/* Since C++11, the following functions are part of the std namespace. Their C - * counteparts should still exist in the global namespace, however cmath - * undefines those functions, which in glibc 2.23, are defined as macros rather - * than functions as in glibc 2.22. - */ -#if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23)) -#include - -using std::fpclassify; -using std::isfinite; -using std::isinf; -using std::isnan; -using std::isnormal; -using std::signbit; -using std::isgreater; -using std::isgreaterequal; -using std::isless; -using std::islessequal; -using std::islessgreater; -using std::isunordered; -#endif - - -#endif /* #define _C99_MATH_H_ */ diff --git a/src/compiler/glsl/lower_instructions.cpp b/src/compiler/glsl/lower_instructions.cpp index f852762..93d203e 100644 --- a/src/compiler/glsl/lower_instructions.cpp +++ b/src/compiler/glsl/lower_instructions.cpp @@ -106,7 +106,6 @@ * Converts double trunc, ceil, floor, round to fract */ -#include "c99_math.h" #include "program/prog_instruction.h" /* for swizzle */ #include "compiler/glsl_types.h" #include "ir.h" @@ -114,6 +113,8 @@ #include "ir_optimization.h" #include "util/half_float.h" +#include + using namespace ir_builder; namespace { diff --git a/src/compiler/nir/nir_lower_double_ops.c b/src/compiler/nir/nir_lower_double_ops.c index ff06ace..6763378 100644 --- a/src/compiler/nir/nir_lower_double_ops.c +++ b/src/compiler/nir/nir_lower_double_ops.c @@ -24,8 +24,8 @@ #include "nir.h" #include "nir_builder.h" -#include "c99_math.h" +#include #include /* diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index 26a73e0..e556f51 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -24,7 +24,6 @@ */ -#include "c99_math.h" #include "glheader.h" #include "context.h" #include "enums.h" @@ -35,6 +34,7 @@ #include "util/bitscan.h" #include "api_exec_decl.h" +#include void GLAPIENTRY _mesa_ShadeModel( GLenum mode ) diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c index 9154e71..155ef9a 100644 --- a/src/mesa/main/pixel.c +++ b/src/mesa/main/pixel.c @@ -28,7 +28,6 @@ * Pixel transfer functions (glPixelZoom, glPixelMap, glPixelTransfer) */ -#include "c99_math.h" #include "glheader.h" #include "bufferobj.h" #include "context.h" @@ -38,6 +37,7 @@ #include "mtypes.h" #include "api_exec_decl.h" +#include /**********************************************************************/ /***** glPixelZoom *****/ diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c index 83485f2..bbbe158 100644 --- a/src/mesa/main/querymatrix.c +++ b/src/mesa/main/querymatrix.c @@ -13,7 +13,8 @@ #include -#include "c99_math.h" +#include + #include "glheader.h" #include "main/get.h" #include "util/macros.h" diff --git a/src/mesa/math/m_debug_norm.c b/src/mesa/math/m_debug_norm.c index dccbdad..01eac87 100644 --- a/src/mesa/math/m_debug_norm.c +++ b/src/mesa/math/m_debug_norm.c @@ -26,7 +26,6 @@ * Gareth Hughes */ -#include "c99_math.h" #include "main/glheader.h" #include "main/context.h" #include "main/macros.h" @@ -37,6 +36,7 @@ #include "m_debug.h" #include "m_debug_util.h" +#include #ifdef __UNIXOS2__ /* The linker doesn't like empty files */ diff --git a/src/mesa/math/m_debug_util.h b/src/mesa/math/m_debug_util.h index 1c65e16..47fe829 100644 --- a/src/mesa/math/m_debug_util.h +++ b/src/mesa/math/m_debug_util.h @@ -32,7 +32,7 @@ #ifdef DEBUG_MATH /* This code only used for debugging */ -#include "c99_math.h" +#include /* Comment this out to deactivate the cycle counter. diff --git a/src/mesa/math/m_matrix.c b/src/mesa/math/m_matrix.c index 62303bc..892c922 100644 --- a/src/mesa/math/m_matrix.c +++ b/src/mesa/math/m_matrix.c @@ -34,8 +34,8 @@ */ #include +#include -#include "c99_math.h" #include "main/errors.h" #include "main/glheader.h" #include "main/macros.h" diff --git a/src/util/format_rgb9e5.h b/src/util/format_rgb9e5.h index 70ad04f..51debd2 100644 --- a/src/util/format_rgb9e5.h +++ b/src/util/format_rgb9e5.h @@ -29,8 +29,7 @@ #include #include - -#include "c99_math.h" +#include #define RGB9E5_EXPONENT_BITS 5 #define RGB9E5_MANTISSA_BITS 9 diff --git a/src/util/rounding.h b/src/util/rounding.h index 5392ad6..f79671b 100644 --- a/src/util/rounding.h +++ b/src/util/rounding.h @@ -24,10 +24,9 @@ #ifndef _ROUNDING_H #define _ROUNDING_H -#include "c99_math.h" - #include #include +#include #if defined(__SSE__) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 1)) || (defined(_M_X64) && !defined(_M_ARM64EC)) #include diff --git a/src/util/u_math.h b/src/util/u_math.h index 5ceb190..7a1ca9d 100644 --- a/src/util/u_math.h +++ b/src/util/u_math.h @@ -40,10 +40,10 @@ #include "c99_compat.h" -#include "c99_math.h" #include #include #include +#include #include "bitscan.h" #include "u_endian.h" /* for UTIL_ARCH_BIG_ENDIAN */ -- 2.7.4