summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-04-22 02:05:40 -0400
committerAlex Deucher <alexdeucher@gmail.com>2010-04-22 02:05:40 -0400
commit59e287d7c484b4addd4a06d013670577639c7ae2 (patch)
tree6cddcc823840e6389e1f30da9fcbac07afdac3ad /src
parent2a6b409496f26da0436972b5feae6ea035dde08d (diff)
r3xx-r5xx: fix vertex units
Noticed by Tormod Volden. RV3xx is 2, RV560,RV570 is 8
Diffstat (limited to 'src')
-rw-r--r--src/radeon_commonfuncs.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index 8c46235d..95193f69 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -170,20 +170,21 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
(5 << R300_PVS_NUM_CNTLRS_SHIFT) |
(5 << R300_VF_MAX_VTX_NUM_SHIFT));
- if (info->ChipFamily == CHIP_FAMILY_RV515)
- vap_cntl |= (2 << R300_PVS_NUM_FPUS_SHIFT);
- else if ((info->ChipFamily == CHIP_FAMILY_RV530) ||
- (info->ChipFamily == CHIP_FAMILY_RV560) ||
- (info->ChipFamily == CHIP_FAMILY_RV570))
+ if ((info->ChipFamily == CHIP_FAMILY_R300) ||
+ (info->ChipFamily == CHIP_FAMILY_R350))
+ vap_cntl |= (4 << R300_PVS_NUM_FPUS_SHIFT);
+ else if (info->ChipFamily == CHIP_FAMILY_RV530)
vap_cntl |= (5 << R300_PVS_NUM_FPUS_SHIFT);
else if ((info->ChipFamily == CHIP_FAMILY_RV410) ||
(info->ChipFamily == CHIP_FAMILY_R420))
vap_cntl |= (6 << R300_PVS_NUM_FPUS_SHIFT);
else if ((info->ChipFamily == CHIP_FAMILY_R520) ||
- (info->ChipFamily == CHIP_FAMILY_R580))
+ (info->ChipFamily == CHIP_FAMILY_R580) ||
+ (info->ChipFamily == CHIP_FAMILY_RV560) ||
+ (info->ChipFamily == CHIP_FAMILY_RV570))
vap_cntl |= (8 << R300_PVS_NUM_FPUS_SHIFT);
else
- vap_cntl |= (4 << R300_PVS_NUM_FPUS_SHIFT);
+ vap_cntl |= (2 << R300_PVS_NUM_FPUS_SHIFT);
if (info->accel_state->has_tcl)
BEGIN_ACCEL(15);