diff options
| author | Brian Paul <[email protected]> | 2003-01-20 15:20:27 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2003-01-20 15:20:27 +0000 |
| commit | a12d12d1190f1baecdedc74a0ff1b62d22615dab (patch) | |
| tree | 03d7bb503250820b458e92e9dab116752014c6c4 /src/mesa | |
| parent | 8f95d790daee7c012364d689e7d86524340469c1 (diff) | |
use COPY_CHAN4 macro
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/swrast/s_aatriangle.c | 7 | ||||
| -rw-r--r-- | src/mesa/swrast/s_aatritemp.h | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/mesa/swrast/s_aatriangle.c b/src/mesa/swrast/s_aatriangle.c index 6c304fd90f4..95cab18a17b 100644 --- a/src/mesa/swrast/s_aatriangle.c +++ b/src/mesa/swrast/s_aatriangle.c @@ -1,10 +1,10 @@ -/* $Id: s_aatriangle.c,v 1.26 2002/10/24 23:57:24 brianp Exp $ */ +/* $Id: s_aatriangle.c,v 1.27 2003/01/20 15:20:27 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 5.1 * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -31,6 +31,7 @@ #include "glheader.h" +#include "colormac.h" #include "macros.h" #include "imports.h" #include "mmath.h" diff --git a/src/mesa/swrast/s_aatritemp.h b/src/mesa/swrast/s_aatritemp.h index a351d0bfeac..4b3d1a092d7 100644 --- a/src/mesa/swrast/s_aatritemp.h +++ b/src/mesa/swrast/s_aatritemp.h @@ -1,4 +1,4 @@ -/* $Id: s_aatritemp.h,v 1.32 2003/01/20 00:25:17 brianp Exp $ */ +/* $Id: s_aatritemp.h,v 1.33 2003/01/20 15:20:27 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -464,10 +464,10 @@ GLint j; for (j = 0; j < (GLint) n; j++) { #ifdef DO_RGBA - COPY_4V(array->rgba[j], array->rgba[j + left]); + COPY_CHAN4(array->rgba[j], array->rgba[j + left]); #endif #ifdef DO_SPEC - COPY_4V(array->spec[j], array->spec[j + left]); + COPY_CHAN4(array->spec[j], array->spec[j + left]); #endif #ifdef DO_INDEX array->index[j] = array->index[j + left]; |