summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorZack Rusin <[email protected]>2007-10-03 10:31:42 -0400
committerZack Rusin <[email protected]>2007-10-03 10:33:38 -0400
commitb46926c4beff4ac14ac0cf2e3bc52f8118ed4d2a (patch)
treecaf4260b8d06a30866f58cc1c9d761a73f73566d /src
parentcdd38d487a311e6c71b76382d428f5dc26caf067 (diff)
Unify the definitions of the 4 component dot product into one
location.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/pipe/draw/draw_clip.c14
-rw-r--r--src/mesa/pipe/draw/draw_private.h10
-rw-r--r--src/mesa/pipe/draw/draw_vertex_shader.c11
3 files changed, 10 insertions, 25 deletions
diff --git a/src/mesa/pipe/draw/draw_clip.c b/src/mesa/pipe/draw/draw_clip.c
index 4e1483f0252..222022d6c10 100644
--- a/src/mesa/pipe/draw/draw_clip.c
+++ b/src/mesa/pipe/draw/draw_clip.c
@@ -138,20 +138,6 @@ static void interp( const struct clipper *clip,
}
}
-
-
-static INLINE float dot4( const float *a,
- const float *b )
-{
- float result = (a[0]*b[0] +
- a[1]*b[1] +
- a[2]*b[2] +
- a[3]*b[3]);
-
- return result;
-}
-
-
#if 0
static INLINE void do_tri( struct draw_stage *next,
struct prim_header *header )
diff --git a/src/mesa/pipe/draw/draw_private.h b/src/mesa/pipe/draw/draw_private.h
index ff38925fc07..b3f1c4d23ea 100644
--- a/src/mesa/pipe/draw/draw_private.h
+++ b/src/mesa/pipe/draw/draw_private.h
@@ -290,5 +290,15 @@ dup_vert( struct draw_stage *stage,
return tmp;
}
+static INLINE float
+dot4(const float *a, const float *b)
+{
+ float result = (a[0]*b[0] +
+ a[1]*b[1] +
+ a[2]*b[2] +
+ a[3]*b[3]);
+
+ return result;
+}
#endif /* DRAW_PRIVATE_H */
diff --git a/src/mesa/pipe/draw/draw_vertex_shader.c b/src/mesa/pipe/draw/draw_vertex_shader.c
index d17496a24f0..49ff3b32ff4 100644
--- a/src/mesa/pipe/draw/draw_vertex_shader.c
+++ b/src/mesa/pipe/draw/draw_vertex_shader.c
@@ -40,17 +40,6 @@
#include "pipe/tgsi/exec/tgsi_core.h"
-
-static INLINE float dot4(const float *a, const float *b)
-{
- float result = (a[0]*b[0] +
- a[1]*b[1] +
- a[2]*b[2] +
- a[3]*b[3]);
-
- return result;
-}
-
static INLINE unsigned
compute_clipmask(const float *clip, const float (*plane)[4], unsigned nr)
{