draw: Properly limit vertex buffer fetches on draw arrays.

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

diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c
index 571986c301170c35919a3e6ac21767c6bb3375b9..beaa1f46e5030ef60aee03ef98e57e68a76749c3 100644 (file)
--- a/src/gallium/drivers/r300/r300_chipset.c
+++ b/src/gallium/drivers/r300/r300_chipset.c
@@ -24,16 +24,42 @@
 #include "r300_chipset.h"
 
 #include "util/u_debug.h"
+#include "util/u_memory.h"
 
 #include <stdio.h>
+#include <errno.h>
 
 /* r300_chipset: A file all to itself for deducing the various properties of
  * Radeons. */
 
+static void r300_apply_hyperz_blacklist(struct r300_capabilities* caps)
+{
+    static const char *list[] = {
+        "X",    /* the DDX or indirect rendering */
+        "Xorg", /* (alternative name) */
+        "check_gl_texture_size", /* compiz */
+        "Compiz",
+        "gnome-session-check-accelerated-helper",
+        "gnome-shell",
+        "kwin_opengl_test",
+        "kwin",
+        "firefox",
+    };
+    int i;
+
+    for (i = 0; i < Elements(list); i++) {
+        if (strcmp(list[i], program_invocation_short_name) == 0) {
+            caps->zmask_ram = 0;
+            caps->hiz_ram = 0;
+            break;
+        }
+    }
+}
+
 /* Parse a PCI ID and fill an r300_capabilities struct with information. */
-void r300_parse_chipset(struct r300_capabilities* caps)
+void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
 {
-    switch (caps->pci_id) {
+    switch (pci_id) {
 #define CHIPSET(pci_id, name, chipfamily) \
         case pci_id: \
             caps->family = CHIP_FAMILY_##chipfamily; \
@@ -43,7 +69,7 @@ void r300_parse_chipset(struct r300_capabilities* caps)
 
     default:
         fprintf(stderr, "r300: Warning: Unknown chipset 0x%x\nAborting...",
-                caps->pci_id);
+                pci_id);
         abort();
     }
 
@@ -138,4 +164,6 @@ void r300_parse_chipset(struct r300_capabilities* caps)
     if (caps->has_tcl) {
         caps->has_tcl = debug_get_bool_option("RADEON_NO_TCL", FALSE) ? FALSE : TRUE;
     }
+
+    r300_apply_hyperz_blacklist(caps);
 }