diff options
| author | Brian Paul <[email protected]> | 2000-09-17 21:56:07 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2000-09-17 21:56:07 +0000 |
| commit | 1c56fdc7072c040de68868748dc2d03c58f5ee22 (patch) | |
| tree | 30d67bdbd9c44c1d830cfb30ada07b39044d1f6c /src/mesa/main/macros.h | |
| parent | f3c399ec11947add49d3a5e9d36d93ff6b45d93e (diff) | |
new comments, misc clean-up
Diffstat (limited to 'src/mesa/main/macros.h')
| -rw-r--r-- | src/mesa/main/macros.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index 2baeb58cee4..70f7b82e8af 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -1,4 +1,4 @@ -/* $Id: macros.h,v 1.8 1999/11/22 18:57:56 brianp Exp $ */ +/* $Id: macros.h,v 1.9 2000/09/17 21:56:07 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -109,7 +109,6 @@ do { \ (DST)[1] = (SRC)[1]; \ } while (0) - #define COPY_3V( DST, SRC ) \ do { \ (DST)[0] = (SRC)[0]; \ @@ -133,7 +132,6 @@ do { \ (DST)[1] = _tmp[1]; \ } while (0) - #define COPY_3FV( DST, SRC ) \ do { \ const GLfloat *_tmp = (SRC); \ @@ -371,11 +369,18 @@ do { \ /* Assign scalers to short vectors: */ -#define ASSIGN_2V( V, V0, V1 ) \ -do { V[0] = V0; V[1] = V1; } while(0) +#define ASSIGN_2V( V, V0, V1 ) \ +do { \ + V[0] = V0; \ + V[1] = V1; \ +} while(0) -#define ASSIGN_3V( V, V0, V1, V2 ) \ -do { V[0] = V0; V[1] = V1; V[2] = V2; } while(0) +#define ASSIGN_3V( V, V0, V1, V2 ) \ +do { \ + V[0] = V0; \ + V[1] = V1; \ + V[2] = V2; \ +} while(0) #define ASSIGN_4V( V, V0, V1, V2, V3 ) \ do { \ @@ -415,7 +420,6 @@ do { \ /* Min of two values: */ #define MIN2( A, B ) ( (A)<(B) ? (A) : (B) ) - /* MAX of two values: */ #define MAX2( A, B ) ( (A)>(B) ? (A) : (B) ) @@ -425,7 +429,6 @@ do { \ /* Dot product of two 3-element vectors */ #define DOT3( a, b ) ( (a)[0]*(b)[0] + (a)[1]*(b)[1] + (a)[2]*(b)[2] ) - /* Dot product of two 4-element vectors */ #define DOT4( a, b ) ( (a)[0]*(b)[0] + (a)[1]*(b)[1] + \ (a)[2]*(b)[2] + (a)[3]*(b)[3] ) @@ -497,4 +500,4 @@ do { \ #define FLOAT_TO_INT(X) ( (GLint) (2147483647.0 * (X)) ) -#endif /*MACROS_H*/ +#endif |