diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-07-01 18:50:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-07-01 18:50:14 +1000 |
| commit | f556b7f84c47d9b32d7daa3e1559c92e47305eb2 (patch) | |
| tree | 5ccd842445b69844ef70b6ae80c10ff0eee7cbbd /src/mesa/drivers/dri/r300/r300_state.c | |
| parent | f4b103dc993491355ec3e3640d9cb060138175c2 (diff) | |
| parent | 646ed82e6b2c092c6db364bf87d6881f39e83eec (diff) | |
Merge branch 'r300-swtcl'
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 |