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 82fa6579a581987bbe4bba28bb24d733e3febb0d..25d1627074e96cc7b3fe9d3affc1260790de42bb 100644 (file)
--- 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);
+
 }
 
 /**