diff options
| author | Brian Paul <[email protected]> | 2009-10-05 14:42:08 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-10-05 14:42:08 -0600 |
| commit | 55770d09c18c4d33403abb97dfef4f897efbbe2a (patch) | |
| tree | 3f3cb2ea42c511c11e134c2d414367df82268cea /progs | |
| parent | f00da2a3ff59c1a7104ac25a1c6eba5a6050ad68 (diff) | |
| parent | 79892e7976fbb91ae426f5868d5f453e977c1f17 (diff) | |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/gallium/auxiliary/util/u_cpu_detect.c
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/glsl/skinning.c | 3 | ||||
| -rw-r--r-- | progs/glsl/texaaline.c | 3 | ||||
| -rw-r--r-- | progs/glsl/twoside.c | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/progs/glsl/skinning.c b/progs/glsl/skinning.c index 65ba98348b6..2b96f31d060 100644 --- a/progs/glsl/skinning.c +++ b/progs/glsl/skinning.c @@ -16,6 +16,9 @@ #include <GL/glut.h> #include "shaderutil.h" +#ifndef M_PI +#define M_PI 3.1415926535 +#endif static char *FragProgFile = "skinning.frag"; static char *VertProgFile = "skinning.vert"; diff --git a/progs/glsl/texaaline.c b/progs/glsl/texaaline.c index 7a5ac405bba..2e4f932ad60 100644 --- a/progs/glsl/texaaline.c +++ b/progs/glsl/texaaline.c @@ -14,6 +14,9 @@ #include <GL/glew.h> #include <GL/glut.h> +#ifndef M_PI +#define M_PI 3.1415926535 +#endif static GLint WinWidth = 300, WinHeight = 300; static GLint win = 0; diff --git a/progs/glsl/twoside.c b/progs/glsl/twoside.c index a57484f96cc..ce155d64e9e 100644 --- a/progs/glsl/twoside.c +++ b/progs/glsl/twoside.c @@ -16,6 +16,9 @@ #include <GL/glut.h> #include "shaderutil.h" +#ifndef M_PI +#define M_PI 3.1415926535 +#endif static GLint WinWidth = 300, WinHeight = 300; static char *FragProgFile = NULL; |