mesa: Branch 'master'

[Ben Skeggs]

 src/mesa/drivers/dri/nouveau/nv30_state.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree b0e86b2dbd11b3ff515172cf1741600c0879ad3f (from aacea5218199b6fb614c75d4f6ee14dd27af70b3)
Author: Ben Skeggs <darktama at iinet.net.au>
Date:   Sun Jan 28 22:55:35 2007 +1100

    nouveau: fix nv30 line width

diff --git a/src/mesa/drivers/dri/nouveau/nv30_state.c b/src/mesa/drivers/dri/nouveau/nv30_state.c
index 9b0d742..55b6463 100644
--- a/src/mesa/drivers/dri/nouveau/nv30_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv30_state.c
@@ -559,7 +559,7 @@ static void nv30LineWidth(GLcontext *ctx
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
 	GLubyte ubWidth;
 
-	CLAMPED_FLOAT_TO_UBYTE(ubWidth, width);
+	ubWidth = (GLubyte)(width * 8.0) & 0xFF;
 
 	BEGIN_RING_CACHE(NvSub3D, NV30_TCL_PRIMITIVE_3D_LINE_WIDTH_SMOOTH, 1);
 	OUT_RING_CACHE(ubWidth);