diff options
| author | Brian Paul <[email protected]> | 2002-06-15 02:38:15 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2002-06-15 02:38:15 +0000 |
| commit | 4753d60dd070bb08d0116076bcc08025c86ce857 (patch) | |
| tree | b1516c35acfa41ae17d575b92b8c776bd530297a /src/mesa/drivers/x11/xm_line.c | |
| parent | 5e54ddc3a69df060c3ca2acbdd45247e30c947d6 (diff) | |
Added ctx parameter to _mesa_debug()
Added _mesa_printf()
Updated SetDrawBuffer() function in all drivers (ala 4.0.3)
Import 4.0.3/DRI changes.
Diffstat (limited to 'src/mesa/drivers/x11/xm_line.c')
| -rw-r--r-- | src/mesa/drivers/x11/xm_line.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/x11/xm_line.c b/src/mesa/drivers/x11/xm_line.c index 30e45b698aa..ce70680901a 100644 --- a/src/mesa/drivers/x11/xm_line.c +++ b/src/mesa/drivers/x11/xm_line.c @@ -1,4 +1,4 @@ -/* $Id: xm_line.c,v 1.18 2001/09/12 03:32:29 brianp Exp $ */ +/* $Id: xm_line.c,v 1.19 2002/06/15 02:38:17 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -560,6 +560,7 @@ static swrast_line_func get_line_func( GLcontext *ctx ) if (ctx->Texture._ReallyEnabled) return (swrast_line_func) NULL; if (ctx->Light.ShadeModel != GL_FLAT) return (swrast_line_func) NULL; if (ctx->Line.StippleFlag) return (swrast_line_func) NULL; + if (swrast->_RasterMask & MULTI_DRAW_BIT) return (swrast_line_func) NULL; if (xmesa->xm_buffer->buffer==XIMAGE && swrast->_RasterMask==DEPTH_BIT |