diff options
| author | Brian Paul <[email protected]> | 2005-11-19 15:42:39 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2005-11-19 15:42:39 +0000 |
| commit | 47e511c36d5e24b1b82fc8fb47970c83f45cc148 (patch) | |
| tree | dfd796edf68dccaeba4a550de058281823eeba9f /src/mesa | |
| parent | 9fd133511c4843675d7bdba620bc0b1674a5c213 (diff) | |
remove #include arbfragparse.h, s/PI/M_PI/
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_fragprog.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c b/src/mesa/drivers/dri/i915/i915_fragprog.c index a96b373a217..eed27677f95 100644 --- a/src/mesa/drivers/dri/i915/i915_fragprog.c +++ b/src/mesa/drivers/dri/i915/i915_fragprog.c @@ -38,14 +38,9 @@ #include "program_instruction.h" #include "program.h" -#include "arbfragparse.h" -#undef PI -#define PI 3.141592 - - /* 1, -1/3!, 1/5!, -1/7! */ static const GLfloat sin_constants[4] = { 1.0, -1.0/(3*2*1), @@ -305,7 +300,7 @@ static void upload_program( struct i915_fragment_program *p ) A0_MUL, tmp, A0_DEST_CHANNEL_X, 0, src0, - i915_emit_const1f(p, 1.0/(PI * 2)), + i915_emit_const1f(p, 1.0/(M_PI * 2)), 0); i915_emit_arith( p, @@ -320,7 +315,7 @@ static void upload_program( struct i915_fragment_program *p ) A0_MUL, tmp, A0_DEST_CHANNEL_X, 0, tmp, - i915_emit_const1f(p, (PI * 2)), + i915_emit_const1f(p, (M_PI * 2)), 0); /* @@ -646,7 +641,7 @@ static void upload_program( struct i915_fragment_program *p ) A0_MUL, tmp, A0_DEST_CHANNEL_X, 0, src0, - i915_emit_const1f(p, 1.0/(PI * 2)), + i915_emit_const1f(p, 1.0/(M_PI * 2)), 0); i915_emit_arith( p, @@ -661,7 +656,7 @@ static void upload_program( struct i915_fragment_program *p ) A0_MUL, tmp, A0_DEST_CHANNEL_X, 0, tmp, - i915_emit_const1f(p, (PI * 2)), + i915_emit_const1f(p, (M_PI * 2)), 0); /* |