R300: update vap_cntl values for NUM_FPUS

based on info from hw team

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 71821a01ea0aff53f2898af35c1862953c7788fe..bd7f060435f3239022ada0206e46e10475cbad41 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -419,13 +419,14 @@ static void r300EmitClearState(GLcontext * ctx)
        if (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV515)
            vap_cntl |= (2 << R300_PVS_NUM_FPUS_SHIFT);
        else if ((r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV530) ||
-                (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV560))
+                (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV560) ||
+                (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV570))
            vap_cntl |= (5 << R300_PVS_NUM_FPUS_SHIFT);
-       else if (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_R420)
+       else if ((r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV410) ||
+                (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_R420))
            vap_cntl |= (6 << R300_PVS_NUM_FPUS_SHIFT);
        else if ((r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_R520) ||
-                (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_R580) ||
-                (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV570))
+                (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_R580))
            vap_cntl |= (8 << R300_PVS_NUM_FPUS_SHIFT);
        else
            vap_cntl |= (4 << R300_PVS_NUM_FPUS_SHIFT);

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index d7a6962acc857dc3c2784946b9a5437e79c48505..fbe5f664181af85fad67e02b10dd3ebed89190fa 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1971,13 +1971,14 @@ static void r300VapCntl(r300ContextPtr rmesa, GLuint input_count,
     if (rmesa->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV515)
        rmesa->hw.vap_cntl.cmd[R300_VAP_CNTL_INSTR] |= (2 << R300_PVS_NUM_FPUS_SHIFT);
     else if ((rmesa->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV530) ||
-            (rmesa->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV560))
+            (rmesa->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV560) ||
+            (rmesa->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV570))
        rmesa->hw.vap_cntl.cmd[R300_VAP_CNTL_INSTR] |= (5 << R300_PVS_NUM_FPUS_SHIFT);
-    else if (rmesa->radeon.radeonScreen->chip_family == CHIP_FAMILY_R420)
+    else if ((rmesa->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV410) ||
+            (rmesa->radeon.radeonScreen->chip_family == CHIP_FAMILY_R420))
        rmesa->hw.vap_cntl.cmd[R300_VAP_CNTL_INSTR] |= (6 << R300_PVS_NUM_FPUS_SHIFT);
     else if ((rmesa->radeon.radeonScreen->chip_family == CHIP_FAMILY_R520) ||
-            (rmesa->radeon.radeonScreen->chip_family == CHIP_FAMILY_R580) ||
-            (rmesa->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV570))
+            (rmesa->radeon.radeonScreen->chip_family == CHIP_FAMILY_R580))
        rmesa->hw.vap_cntl.cmd[R300_VAP_CNTL_INSTR] |= (8 << R300_PVS_NUM_FPUS_SHIFT);
     else
        rmesa->hw.vap_cntl.cmd[R300_VAP_CNTL_INSTR] |= (4 << R300_PVS_NUM_FPUS_SHIFT);