diff options
| author | brianp <brianp> | 2002-06-26 15:04:34 +0000 |
|---|---|---|
| committer | brianp <brianp> | 2002-06-26 15:04:34 +0000 |
| commit | 65ba6a533fb23480952c01575c19f5a6bf0f3f8f (patch) | |
| tree | 517937c0335ce1f304ee617a21ad51e5c558024f /xc/extras/Mesa/src/X | |
| parent | dee82c9b16f1a168d0e32c70c079b56a371deb90 (diff) | |
bring in final Mesa 4.0.3 changes
Diffstat (limited to 'xc/extras/Mesa/src/X')
| -rw-r--r-- | xc/extras/Mesa/src/X/xm_tri.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xc/extras/Mesa/src/X/xm_tri.c b/xc/extras/Mesa/src/X/xm_tri.c index c4b561298..c2e205afe 100644 --- a/xc/extras/Mesa/src/X/xm_tri.c +++ b/xc/extras/Mesa/src/X/xm_tri.c @@ -1526,10 +1526,12 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx ) triFuncName = NULL; #endif - 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 (ctx->RenderMode != GL_RENDER || + ctx->Polygon.SmoothFlag || + ctx->Texture._ReallyEnabled || + (swrast->_RasterMask & MULTI_DRAW_BIT) || + (ctx->Polygon.CullFlag && ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)) + return (swrast_tri_func) NULL; if (xmesa->xm_buffer->buffer==XIMAGE) { if ( ctx->Light.ShadeModel==GL_SMOOTH |