From: Benno Schulenberg <bensberg@justemail.net>
Date: Thu, 8 Nov 2007 14:34:20 +0000 (-0700)
Subject: fix Unichrome/Blender crash, bug 13142
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1dfec88e72c92647b779286bbc8e6ee313d6f1f6;p=mesa.git

fix Unichrome/Blender crash, bug 13142
---

diff --git a/src/mesa/drivers/dri/unichrome/via_tris.c b/src/mesa/drivers/dri/unichrome/via_tris.c
index 4cc7942b1b6..73e66260711 100644
--- a/src/mesa/drivers/dri/unichrome/via_tris.c
+++ b/src/mesa/drivers/dri/unichrome/via_tris.c
@@ -666,9 +666,11 @@ static void viaChooseRenderState(GLcontext *ctx)
    }
 
    if (flags & (ANY_FALLBACK_FLAGS|ANY_RASTER_FLAGS)) {
-      if (flags & DD_TRI_LIGHT_TWOSIDE)    index |= VIA_TWOSIDE_BIT;
+      if (ctx->Light.Enabled && ctx->Light.Model.TwoSide)
+         index |= VIA_TWOSIDE_BIT;
       if (flags & DD_TRI_OFFSET)           index |= VIA_OFFSET_BIT;
-      if (flags & DD_TRI_UNFILLED)         index |= VIA_UNFILLED_BIT;
+      if (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL)
+         index |= VIA_UNFILLED_BIT;
       if (flags & ANY_FALLBACK_FLAGS)      index |= VIA_FALLBACK_BIT;
 
       /* Hook in fallbacks for specific primitives.