projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeon: Make RADEON_CMDBUF more fine grained.
[mesa.git]
/
src
/
mesa
/
swrast
/
s_blend.c
diff --git
a/src/mesa/swrast/s_blend.c
b/src/mesa/swrast/s_blend.c
index 82c5e84294a21a270f619bfd52d2fdbf786ac806..95c83432a9c6cf9dbb85621c160b68ca6f816b64 100644
(file)
--- a/
src/mesa/swrast/s_blend.c
+++ b/
src/mesa/swrast/s_blend.c
@@
-1,8
+1,8
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version:
6.5.2
+ * Version:
7.1
*
*
- * Copyright (C) 1999-200
6
Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-200
8
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"),
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@
-35,10
+35,10
@@
-#include "glheader.h"
-#include "context.h"
-#include "colormac.h"
-#include "macros.h"
+#include "
main/
glheader.h"
+#include "
main/
context.h"
+#include "
main/
colormac.h"
+#include "ma
in/ma
cros.h"
#include "s_blend.h"
#include "s_context.h"
#include "s_blend.h"
#include "s_context.h"
@@
-880,7
+880,8
@@
blend_general(GLcontext *ctx, GLuint n, const GLubyte mask[],
}
}
else {
}
}
else {
- blend_general_float(ctx, n, mask, rgbaF, destF, chanType);
+ blend_general_float(ctx, n, mask, (GLfloat (*)[4]) src,
+ (GLfloat (*)[4]) dst, chanType);
}
}
}
}