fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: simplify the M_PI*f macros, fixes build on OpenBSD

Browse source 
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" <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78665
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
This commit is contained in:
Jonathan Gray 2014-05-14 15:13:55 +10:00 • committed by Matt Turner
parent a5769ad373
commit 0c0bbe77d0
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/glsl/builtin_functions.cpp
View file

@ -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;