aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2008-05-15 14:51:50 +1000
committerDave Airlie <[email protected]>2008-05-15 18:40:07 +1000
commitc9d5d11d2da77fada77dca1e239accd126fa3300 (patch)
tree7569358f6a4dde3e938677162b9988b5c950fe67 /src/mesa
parent412c850eaba82a06532fcb6300234a63e7ae037b (diff)
r3/500: emit RS state before VAP
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/r300/r300_state.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 82fa6579a58..25d1627074e 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);
+
}
/**