Mesa (master): mesa: remove unused macros in macros.h
Brian Paul
brianp at kemper.freedesktop.org
Tue Nov 15 14:55:25 UTC 2011
Module: Mesa
Branch: master
Commit: bef4b42938c92fbd6540e81ea4829b0f1d0a6a8b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bef4b42938c92fbd6540e81ea4829b0f1d0a6a8b
Author: Brian Paul <brianp at vmware.com>
Date: Sat Nov 12 11:50:32 2011 -0700
mesa: remove unused macros in macros.h
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/mesa/main/macros.h | 26 --------------------------
1 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 2a849e3..d90905f 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -588,19 +588,6 @@ do { \
*/
#define LINTERP(T, OUT, IN) ((OUT) + (T) * ((IN) - (OUT)))
-/* Can do better with integer math
- */
-#define INTERP_UB( t, dstub, outub, inub ) \
-do { \
- GLfloat inf = UBYTE_TO_FLOAT( inub ); \
- GLfloat outf = UBYTE_TO_FLOAT( outub ); \
- GLfloat dstf = LINTERP( t, outf, inf ); \
- UNCLAMPED_FLOAT_TO_UBYTE( dstub, dstf ); \
-} while (0)
-
-#define INTERP_UI( t, dstui, outui, inui ) \
- dstui = (GLuint) (GLint) LINTERP( (t), (GLfloat) (outui), (GLfloat) (inui) )
-
#define INTERP_F( t, dstf, outf, inf ) \
dstf = LINTERP( t, outf, inf )
@@ -619,16 +606,6 @@ do { \
dst[2] = LINTERP( (t), (out)[2], (in)[2] ); \
} while (0)
-#define INTERP_SZ( t, vec, to, out, in, sz ) \
-do { \
- switch (sz) { \
- case 4: vec[to][3] = LINTERP( (t), (vec)[out][3], (vec)[in][3] ); \
- case 3: vec[to][2] = LINTERP( (t), (vec)[out][2], (vec)[in][2] ); \
- case 2: vec[to][1] = LINTERP( (t), (vec)[out][1], (vec)[in][1] ); \
- case 1: vec[to][0] = LINTERP( (t), (vec)[out][0], (vec)[in][0] ); \
- } \
-} while(0)
-
/*@}*/
@@ -656,9 +633,6 @@ do { \
#define DOT4( a, b ) ( (a)[0]*(b)[0] + (a)[1]*(b)[1] + \
(a)[2]*(b)[2] + (a)[3]*(b)[3] )
-/** Dot product of two 4-element vectors */
-#define DOT4V(v,a,b,c,d) (v[0]*(a) + v[1]*(b) + v[2]*(c) + v[3]*(d))
-
/** Cross product of two 3-element vectors */
#define CROSS3(n, u, v) \
More information about the mesa-commit
mailing list