summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorMark Anderson <linuxman@prodigy.net>2008-08-19 08:31:08 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-08-20 15:33:03 -0600
commit145f5f60f19574e06c536c102bec0cfd6320606d (patch)
tree10001162d09418ec9387b89906d39fe81e5d1fd4 /src/mesa
parent2848b55ed5cfa3afc00937baa967fd7765fc5613 (diff)
mesa: fix float blend bug
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_blend.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_blend.c b/src/mesa/swrast/s_blend.c
index 82c5e84294..4531f0ae02 100644
--- a/src/mesa/swrast/s_blend.c
+++ b/src/mesa/swrast/s_blend.c
@@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
- * Version: 6.5.2
+ * Version: 7.1
*
- * Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2008 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"),
@@ -880,7 +880,8 @@ blend_general(GLcontext *ctx, GLuint n, const GLubyte mask[],
}
}
else {
- blend_general_float(ctx, n, mask, rgbaF, destF, chanType);
+ blend_general_float(ctx, n, mask, (GLfloat (*)[4]) src,
+ (GLfloat (*)[4]) dst, chanType);
}
}