FRONT_AND_BACK culling

diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 5675171b96e6ddf0d6ff68db77381c780533388d..d5c37c3e0025c0b08722f1260d727f61b3a25409 100644 (file)
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1,4 +1,4 @@
-/* $Id: osmesa.c,v 1.82 2002/06/15 03:03:10 brianp Exp $ */
+/* $Id: osmesa.c,v 1.83 2002/06/25 08:44:56 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1960,6 +1960,9 @@ osmesa_choose_triangle_function( GLcontext *ctx )
    if (osmesa->format != OSMESA_RGBA &&
        osmesa->format != OSMESA_BGRA &&
        osmesa->format != OSMESA_ARGB)   return (swrast_tri_func) NULL;
+   if (ctx->Polygon.CullFlag && 
+       ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK))
+                                        return (swrast_tri_func) NULL;
 
    if (swrast->_RasterMask == DEPTH_BIT &&
        ctx->Depth.Func == GL_LESS &&

diff --git a/src/mesa/drivers/x11/xm_tri.c b/src/mesa/drivers/x11/xm_tri.c
index 4b3f02677e406cb9a637f9a78d58a55fa6379c50..5615f5ec2f7b3d73c30e0aed09c2b4d4f274db63 100644 (file)
--- 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.24 2002/06/15 03:03:10 brianp Exp $ */
+/* $Id: xm_tri.c,v 1.25 2002/06/25 08:44:27 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1531,6 +1531,9 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx )
    if (ctx->Polygon.SmoothFlag)       return (swrast_tri_func) NULL;
    if (ctx->Texture._EnabledUnits)    return (swrast_tri_func) NULL;
    if (swrast->_RasterMask & MULTI_DRAW_BIT) return (swrast_tri_func) NULL;
+   if (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