summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2002-06-25 08:44:27 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2002-06-25 08:44:27 +0000
commit07bb9884a5decd19119d9474af06c0d7ddc726b5 (patch)
tree20eb1640c0704d06edfce6ff3a42bc28e88f3ebd
parent82d9f3c034ca60da03f3f004f63f19ac51664410 (diff)
FRONT_AND_BACK culling
-rw-r--r--src/mesa/drivers/osmesa/osmesa.c5
-rw-r--r--src/mesa/drivers/x11/xm_tri.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 5675171b96..d5c37c3e00 100644
--- 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 4b3f02677e..5615f5ec2f 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.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