summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-04-22 02:37:34 -0400
committerAlex Deucher <alexdeucher@gmail.com>2010-04-22 02:37:34 -0400
commit48a18061260b4300ce67ab39ec3d303763db2345 (patch)
tree7bddbf98366496221781be7eb1840b0ea906e393
parent7a0b48e3492e8d8f0b5d1cc882eed2b0f51c3dd8 (diff)
r300g: fix vertex unit setup
RV3xx is 2, RV560,RV570 is 8 Noticed by Tormod Volden.
-rw-r--r--src/gallium/drivers/r300/r300_chipset.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c
index 928a310bd8..e6dca66d4a 100644
--- a/src/gallium/drivers/r300/r300_chipset.c
+++ b/src/gallium/drivers/r300/r300_chipset.c
@@ -33,7 +33,7 @@
void r300_parse_chipset(struct r300_capabilities* caps)
{
/* Reasonable defaults */
- caps->num_vert_fpus = 4;
+ caps->num_vert_fpus = 2;
caps->num_tex_units = 16;
caps->has_tcl = debug_get_bool_option("RADEON_NO_TCL", FALSE) ? FALSE : TRUE;
caps->is_r400 = FALSE;
@@ -47,6 +47,7 @@ void r300_parse_chipset(struct r300_capabilities* caps)
case 0x4144:
caps->family = CHIP_FAMILY_R300;
caps->high_second_pipe = TRUE;
+ caps->num_vert_fpus = 4;
break;
case 0x4145:
@@ -58,6 +59,7 @@ void r300_parse_chipset(struct r300_capabilities* caps)
case 0x4E47:
caps->family = CHIP_FAMILY_R300;
caps->high_second_pipe = TRUE;
+ caps->num_vert_fpus = 4;
break;
case 0x4150:
@@ -86,11 +88,13 @@ void r300_parse_chipset(struct r300_capabilities* caps)
case 0x4E4B:
caps->family = CHIP_FAMILY_R350;
caps->high_second_pipe = TRUE;
+ caps->num_vert_fpus = 4;
break;
case 0x4E4A:
caps->family = CHIP_FAMILY_R360;
caps->high_second_pipe = TRUE;
+ caps->num_vert_fpus = 4;
break;
case 0x5460:
@@ -347,7 +351,7 @@ void r300_parse_chipset(struct r300_capabilities* caps)
case 0x7280:
caps->family = CHIP_FAMILY_RV570;
- caps->num_vert_fpus = 5;
+ caps->num_vert_fpus = 8;
caps->is_r500 = TRUE;
break;
@@ -363,7 +367,7 @@ void r300_parse_chipset(struct r300_capabilities* caps)
case 0x7293:
case 0x7297:
caps->family = CHIP_FAMILY_RV560;
- caps->num_vert_fpus = 5;
+ caps->num_vert_fpus = 8;
caps->is_r500 = TRUE;
break;