diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-06-15 02:38:15 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-06-15 02:38:15 +0000 |
| commit | 4753d60dd070bb08d0116076bcc08025c86ce857 (patch) | |
| tree | b1516c35acfa41ae17d575b92b8c776bd530297a /src/mesa/drivers/x11/xm_tri.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_tri.c')
| -rw-r--r-- | src/mesa/drivers/x11/xm_tri.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/xm_tri.c b/src/mesa/drivers/x11/xm_tri.c index 6a8b678d7b..f0aef4c0ec 100644 --- a/src/mesa/drivers/x11/xm_tri.c +++ b/src/mesa/drivers/x11/xm_tri.c @@ -1,4 +1,4 @@ -/* $Id: xm_tri.c,v 1.22 2002/04/19 14:05:51 brianp Exp $ */ +/* $Id: xm_tri.c,v 1.23 2002/06/15 02:38:17 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1505,7 +1505,6 @@ static const char *triFuncName = NULL; #define USE(triFunc) \ do { \ triFuncName = #triFunc; \ - /*printf("%s\n", triFuncName);*/ \ return triFunc; \ } while (0) @@ -1531,6 +1530,7 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx ) if (ctx->RenderMode != GL_RENDER) return (swrast_tri_func) NULL; if (ctx->Polygon.SmoothFlag) return (swrast_tri_func) NULL; if (ctx->Texture._ReallyEnabled) return (swrast_tri_func) NULL; + if (swrast->_RasterMask & MULTI_DRAW_BIT) return (swrast_tri_func) NULL; if (xmesa->xm_buffer->buffer==XIMAGE) { if ( ctx->Light.ShadeModel==GL_SMOOTH |