diff options
| author | Jonathan Gray <[email protected]> | 2014-05-14 15:13:55 +1000 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2014-05-13 22:30:22 -0700 |
| commit | 0c0bbe77d0f92acf34c4582207b9def2e2fe308d (patch) | |
| tree | 8f05eb8daa7174bb3b97418f72d5b05471d219f7 | |
| parent | a5769ad3730001417cdae0e57740842f6f71f908 (diff) | |
glsl: simplify the M_PI*f macros, fixes build on OpenBSD
The M_PI*f macros used a preprocessor paste to append 'f'
to M_PI defines, which works if the values are only numbers
but breaks on OpenBSD where M_PI definitions have casts
and brackets to meet requirements of a future version of POSIX,
http://austingroupbugs.net/view.php?id=801
http://austingroupbugs.net/view.php?id=828
Simplify the M_PI*f macros by using casts directly in the defines
as suggested by Kenneth Graunke.
Cc: "10.2" <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78665
Reviewed-by: Matt Turner <[email protected]>
Signed-off-by: Jonathan Gray <[email protected]>
| -rw-r--r-- | src/glsl/builtin_functions.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index 3991f9d8d8c..f9f06862e44 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -62,11 +62,9 @@ #include "program/prog_instruction.h" #include <limits> -#define f(x) join(x) -#define join(x) x ## f -#define M_PIf f(M_PI) -#define M_PI_2f f(M_PI_2) -#define M_PI_4f f(M_PI_4) +#define M_PIf ((float) M_PI) +#define M_PI_2f ((float) M_PI_2) +#define M_PI_4f ((float) M_PI_4) using namespace ir_builder; |