From: Dave Airlie <airlied@redhat.com>
Date: Thu, 15 May 2008 04:51:50 +0000 (+1000)
Subject: r3/500: emit RS state before VAP
X-Git-Tag: 062012170305~18614^2~75
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c9d5d11d2da77fada77dca1e239accd126fa3300;p=profile%2Fivi%2Fmesa.git

r3/500: emit RS state before VAP
---

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 82fa657..25d1627 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -2500,13 +2500,14 @@ void r300UpdateShaderStates(r300ContextPtr rmesa)
 		r300SetupPixelShader(rmesa);
 	r300SetupTextures(ctx);
 
-	if ((rmesa->radeon.radeonScreen->chip_flags & RADEON_CHIPSET_TCL))
-		r300SetupVertexProgram(rmesa);
-
 	if (rmesa->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515)
 		r500SetupRSUnit(ctx);
 	else
 		r300SetupRSUnit(ctx);
+
+	if ((rmesa->radeon.radeonScreen->chip_flags & RADEON_CHIPSET_TCL))
+		r300SetupVertexProgram(rmesa);
+
 }
 
 /**