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_lines.c
diff --git
a/src/mesa/swrast/s_lines.c
b/src/mesa/swrast/s_lines.c
index 15ef6233eda8fa3971fe775c2cf1c16fe2086778..23cb9b57eff77489f833680e6eb13416c53b97b7 100644
(file)
--- a/
src/mesa/swrast/s_lines.c
+++ b/
src/mesa/swrast/s_lines.c
@@
-1,6
+1,6
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version:
6.5.3
+ * Version:
7.1
*
* Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
*
*
* Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
*
@@
-23,10
+23,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_aaline.h"
#include "s_context.h"
#include "s_depth.h"
#include "s_aaline.h"
#include "s_context.h"
#include "s_depth.h"
@@
-279,7
+279,11
@@
_swrast_choose_line( GLcontext *ctx )
|| ctx->Line.StippleFlag) {
/* no texture, but Z, fog, width>1, stipple, etc. */
if (rgbmode)
|| ctx->Line.StippleFlag) {
/* no texture, but Z, fog, width>1, stipple, etc. */
if (rgbmode)
+#if CHAN_BITS == 32
+ USE(general_line);
+#else
USE(rgba_line);
USE(rgba_line);
+#endif
else
USE(ci_line);
}
else
USE(ci_line);
}