summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-01-09 00:27:49 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-01-09 00:27:49 +0000
commit35e5e89f5614ebb032479b02dec888563f829b30 (patch)
treeba0a8fb9bb057dc9ccbf12d3a00c2bc42b3bf15d /src/mesa
parent8927fbe9c5d0e0657cce61dc8bf9665d00765a61 (diff)
fixed GL_REPLACE / GL_RGB bug
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_triangle.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index cc5fc5b0d6..d61a2bb659 100644
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -1,4 +1,4 @@
-/* $Id: s_triangle.c,v 1.45 2002/01/09 00:09:33 brianp Exp $ */
+/* $Id: s_triangle.c,v 1.46 2002/01/09 00:27:49 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -392,7 +392,12 @@ affine_span(GLcontext *ctx, struct sw_span *span,
/* shortcuts */
-#define NEAREST_RGB_REPLACE NEAREST_RGB;REPLACE
+#define NEAREST_RGB_REPLACE \
+ NEAREST_RGB; \
+ dest[0] = sample[0]; \
+ dest[1] = sample[1]; \
+ dest[2] = sample[2]; \
+ dest[3] = FixedToInt(span->alpha);
#define NEAREST_RGBA_REPLACE COPY_CHAN4(dest, tex00)