From: Dave Airlie <airlied@nx6125b.(none)>
Date: Thu, 21 Jun 2007 05:07:31 +0000 (+1000)
Subject: fix unfilled tris/quads
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=faab84cfa6576a166c93d92e3faf3f3582a3a4bd;p=mesa.git

fix unfilled tris/quads
---

diff --git a/src/mesa/drivers/dri/r300/r300_swtcl.c b/src/mesa/drivers/dri/r300/r300_swtcl.c
index dfa02f95232..97f1583abdd 100644
--- a/src/mesa/drivers/dri/r300/r300_swtcl.c
+++ b/src/mesa/drivers/dri/r300/r300_swtcl.c
@@ -699,7 +699,8 @@ static void r300RenderStart(GLcontext *ctx)
 	drm_radeon_cmd_header_t *cmd = NULL;
 
 	//	fprintf(stderr, "%s\n", __FUNCTION__);
-	
+
+	r300ChooseRenderState(ctx);	
 	r300SetVertexFormat(ctx);
 
 	r300UpdateShaderStates(rmesa);
@@ -745,8 +746,11 @@ static void r300RenderPrimitive(GLcontext *ctx, GLenum prim)
 
 	r300ContextPtr rmesa = R300_CONTEXT(ctx);
 	rmesa->swtcl.render_primitive = prim;
-	if (prim < GL_TRIANGLES || !(ctx->_TriangleCaps & DD_TRI_UNFILLED)) 
-	  r300RasterPrimitive( ctx, reduced_prim[prim] );
+
+	if ((prim == GL_TRIANGLES) && (ctx->_TriangleCaps & DD_TRI_UNFILLED))
+	  return;
+
+	r300RasterPrimitive( ctx, reduced_prim[prim] );
 	//	fprintf(stderr, "%s\n", __FUNCTION__);
 	
 }