Merge branch 'mesa_7_5_branch'

[mesa.git] / src / gallium / drivers / r300 / r300_chipset.h

diff --git a/src/gallium/drivers/r300/r300_chipset.h b/src/gallium/drivers/r300/r300_chipset.h
index a9cd372ec5591288372340bee15d3c4a170b7e3a..5b2e1f0568817e6bb54c7731ffc098d5da41accf 100644 (file)
--- a/src/gallium/drivers/r300/r300_chipset.h
+++ b/src/gallium/drivers/r300/r300_chipset.h
@@ -34,8 +34,6 @@ struct r300_capabilities {
     int family;
     /* The number of vertex floating-point units */
     int num_vert_fpus;
-    /* The number of fragment pipes */
-    int num_frag_pipes;
     /* Whether or not TCL is physically present */
     boolean has_tcl;
     /* Whether or not this is an RV515 or newer; R500s have many differences
@@ -64,6 +62,7 @@ enum {
     CHIP_FAMILY_RC410,
     CHIP_FAMILY_RS480,
     CHIP_FAMILY_RS482,
+    CHIP_FAMILY_RS600,
     CHIP_FAMILY_RS690,
     CHIP_FAMILY_RS740,
     CHIP_FAMILY_RV515,