diff options
author | Patrice Mandin <pmandin@caramail.com> | 2007-07-07 00:08:35 +0200 |
---|---|---|
committer | Patrice Mandin <pmandin@caramail.com> | 2007-07-07 00:08:35 +0200 |
commit | f0aa6654e27b279ecb29e9fd19c140cb1ac7946f (patch) | |
tree | ea9caba04ed3c5b3005edd79060002cb66a5e03a /src/mesa/drivers/dri/r300/r300_state.c | |
parent | 69501d76fc6a45da48bf4c416ac9e15edd44e7a9 (diff) | |
parent | f98bdfca574478837b33c97d131dad4833e3ee12 (diff) |
Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_state.c')
-rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 310102fcc5..b5cf21d644 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -1782,13 +1782,15 @@ static void r300ResetHwState(r300ContextPtr r300) r300->hw.vap_clip.cmd[4] = r300PackFloat32(1.0); /* Y */ /* XXX: Other families? */ - switch (r300->radeon.radeonScreen->chip_family) { - case CHIP_FAMILY_R300: - r300->hw.unk2288.cmd[1] = R300_2288_R300; - break; - default: - r300->hw.unk2288.cmd[1] = R300_2288_RV350; - break; + if (has_tcl) { + switch (r300->radeon.radeonScreen->chip_family) { + case CHIP_FAMILY_R300: + r300->hw.unk2288.cmd[1] = R300_2288_R300; + break; + default: + r300->hw.unk2288.cmd[1] = R300_2288_RV350; + break; + } } r300->hw.gb_enable.cmd[1] = R300_GB_POINT_STUFF_ENABLE |