Merge remote-tracking branch 'origin/master' into pipe-video

Conflicts:
	src/gallium/tests/unit/u_format_test.c
	src/gallium/winsys/r600/drm/r600_hw_context.c

5 files changed, 108 insertions, 393 deletions

diff --git a/src/gallium/drivers/r300/Makefile b/src/gallium/drivers/r300/Makefile
index 37b0f01cfd3..dfedf353877 100644
--- a/src/gallium/drivers/r300/Makefile
+++ b/src/gallium/drivers/r300/Makefile
@@ -30,7 +30,8 @@ C_SOURCES = \
 	r300_transfer.c
 
 LIBRARY_INCLUDES = \
-	-I$(TOP)/src/mesa/drivers/dri/r300/compiler
+	-I$(TOP)/src/mesa/drivers/dri/r300/compiler \
+	-I$(TOP)/include
 
 COMPILER_ARCHIVE = $(TOP)/src/mesa/drivers/dri/r300/compiler/libr300compiler.a
 
diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c
index 4949703120d..571986c3011 100644
--- a/src/gallium/drivers/r300/r300_chipset.c
+++ b/src/gallium/drivers/r300/r300_chipset.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008 Corbin Simpson <[email protected]>
+ * Copyright 2011 Marek Olšák <[email protected]>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,392 +33,109 @@
 /* Parse a PCI ID and fill an r300_capabilities struct with information. */
 void r300_parse_chipset(struct r300_capabilities* caps)
 {
-    /* Reasonable defaults */
-    caps->num_vert_fpus = 2;
-    caps->num_tex_units = 16;
-    caps->has_tcl = debug_get_bool_option("RADEON_NO_TCL", FALSE) ? FALSE : TRUE;
-    caps->hiz_ram = 0;
-    caps->is_r400 = FALSE;
-    caps->is_r500 = FALSE;
-    caps->high_second_pipe = FALSE;
-
-    /* Note: These are not ordered by PCI ID. I leave that task to GCC,
-     * which will perform the ordering while collating jump tables. Instead,
-     * I've tried to group them according to capabilities and age. */
     switch (caps->pci_id) {
-        case 0x4144:
-            caps->family = CHIP_FAMILY_R300;
-            caps->high_second_pipe = TRUE;
-            caps->num_vert_fpus = 4;
-            caps->hiz_ram = R300_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x4145:
-        case 0x4146:
-        case 0x4147:
-        case 0x4E44:
-        case 0x4E45:
-        case 0x4E46:
-        case 0x4E47:
-            caps->family = CHIP_FAMILY_R300;
-            caps->high_second_pipe = TRUE;
-            caps->num_vert_fpus = 4;
-            caps->hiz_ram = R300_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x4150:
-        case 0x4151:
-        case 0x4152:
-        case 0x4153:
-        case 0x4154:
-        case 0x4155:
-        case 0x4156:
-        case 0x4E50:
-        case 0x4E51:
-        case 0x4E52:
-        case 0x4E53:
-        case 0x4E54:
-        case 0x4E56:
-            caps->family = CHIP_FAMILY_RV350;
-            caps->high_second_pipe = TRUE;
-            caps->zmask_ram = RV3xx_ZMASK_SIZE;
-            break;
-
-        case 0x4148:
-        case 0x4149:
-        case 0x414A:
-        case 0x414B:
-        case 0x4E48:
-        case 0x4E49:
-        case 0x4E4B:
-            caps->family = CHIP_FAMILY_R350;
-            caps->high_second_pipe = TRUE;
-            caps->num_vert_fpus = 4;
-            caps->hiz_ram = R300_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x4E4A:
-            caps->family = CHIP_FAMILY_R360;
-            caps->high_second_pipe = TRUE;
-            caps->num_vert_fpus = 4;
-            caps->hiz_ram = R300_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x5460:
-        case 0x5462:
-        case 0x5464:
-        case 0x5B60:
-        case 0x5B62:
-        case 0x5B63:
-        case 0x5B64:
-        case 0x5B65:
-            caps->family = CHIP_FAMILY_RV370;
-            caps->high_second_pipe = TRUE;
-            caps->zmask_ram = RV3xx_ZMASK_SIZE;
-            break;
-
-        case 0x3150:
-        case 0x3152:
-        case 0x3154:
-        case 0x3155:
-        case 0x3E50:
-        case 0x3E54:
-            caps->family = CHIP_FAMILY_RV380;
-            caps->high_second_pipe = TRUE;
-            caps->hiz_ram = R300_HIZ_LIMIT;
-            caps->zmask_ram = RV3xx_ZMASK_SIZE;
-            break;
-
-        case 0x4A48:
-        case 0x4A49:
-        case 0x4A4A:
-        case 0x4A4B:
-        case 0x4A4C:
-        case 0x4A4D:
-        case 0x4A4E:
-        case 0x4A4F:
-        case 0x4A50:
-        case 0x4A54:
-            caps->family = CHIP_FAMILY_R420;
-            caps->num_vert_fpus = 6;
-            caps->is_r400 = TRUE;
-            caps->hiz_ram = R300_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x5548:
-        case 0x5549:
-        case 0x554A:
-        case 0x554B:
-        case 0x5550:
-        case 0x5551:
-        case 0x5552:
-        case 0x5554:
-        case 0x5D57:
-            caps->family = CHIP_FAMILY_R423;
-            caps->num_vert_fpus = 6;
-            caps->is_r400 = TRUE;
-            caps->hiz_ram = R300_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x554C:
-        case 0x554D:
-        case 0x554E:
-        case 0x554F:
-        case 0x5D48:
-        case 0x5D49:
-        case 0x5D4A:
-            caps->family = CHIP_FAMILY_R430;
-            caps->num_vert_fpus = 6;
-            caps->is_r400 = TRUE;
-            caps->hiz_ram = R300_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x5D4C:
-        case 0x5D4D:
-        case 0x5D4E:
-        case 0x5D4F:
-        case 0x5D50:
-        case 0x5D52:
-            caps->family = CHIP_FAMILY_R480;
-            caps->num_vert_fpus = 6;
-            caps->is_r400 = TRUE;
-            caps->hiz_ram = R300_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x4B48:
-        case 0x4B49:
-        case 0x4B4A:
-        case 0x4B4B:
-        case 0x4B4C:
-            caps->family = CHIP_FAMILY_R481;
-            caps->num_vert_fpus = 6;
-            caps->is_r400 = TRUE;
-            caps->hiz_ram = R300_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x5E4C:
-        case 0x5E4F:
-        case 0x564A:
-        case 0x564B:
-        case 0x564F:
-        case 0x5652:
-        case 0x5653:
-        case 0x5657:
-        case 0x5E48:
-        case 0x5E4A:
-        case 0x5E4B:
-        case 0x5E4D:
-            caps->family = CHIP_FAMILY_RV410;
-            caps->num_vert_fpus = 6;
-            caps->is_r400 = TRUE;
-            caps->hiz_ram = R300_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x5954:
-        case 0x5955:
-            caps->family = CHIP_FAMILY_RS480;
-            caps->has_tcl = FALSE;
-            caps->zmask_ram = RV3xx_ZMASK_SIZE;
+#define CHIPSET(pci_id, name, chipfamily) \
+        case pci_id: \
+            caps->family = CHIP_FAMILY_##chipfamily; \
             break;
+#include "pci_ids/r300_pci_ids.h"
+#undef CHIPSET
 
-        case 0x5974:
-        case 0x5975:
-            caps->family = CHIP_FAMILY_RS482;
-            caps->has_tcl = FALSE;
-            caps->zmask_ram = RV3xx_ZMASK_SIZE;
-            break;
-
-        case 0x5A41:
-        case 0x5A42:
-            caps->family = CHIP_FAMILY_RS400;
-            caps->has_tcl = FALSE;
-            break;
-
-        case 0x5A61:
-        case 0x5A62:
-            caps->family = CHIP_FAMILY_RC410;
-            caps->has_tcl = FALSE;
-            caps->zmask_ram = RV3xx_ZMASK_SIZE;
-            break;
-
-        case 0x791E:
-        case 0x791F:
-            caps->family = CHIP_FAMILY_RS690;
-            caps->has_tcl = FALSE;
-            caps->is_r400 = TRUE;
-            break;
-
-        case 0x793F:
-        case 0x7941:
-        case 0x7942:
-            caps->family = CHIP_FAMILY_RS600;
-            caps->has_tcl = FALSE;
-            caps->is_r400 = TRUE;
-            break;
-
-        case 0x796C:
-        case 0x796D:
-        case 0x796E:
-        case 0x796F:
-            caps->family = CHIP_FAMILY_RS740;
-            caps->has_tcl = FALSE;
-            caps->is_r400 = TRUE;
-            break;
-
-        case 0x7100:
-        case 0x7101:
-        case 0x7102:
-        case 0x7103:
-        case 0x7104:
-        case 0x7105:
-        case 0x7106:
-        case 0x7108:
-        case 0x7109:
-        case 0x710A:
-        case 0x710B:
-        case 0x710C:
-        case 0x710E:
-        case 0x710F:
-            caps->family = CHIP_FAMILY_R520;
-            caps->num_vert_fpus = 8;
-            caps->is_r500 = TRUE;
-            caps->hiz_ram = R300_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x7140:
-        case 0x7141:
-        case 0x7142:
-        case 0x7143:
-        case 0x7144:
-        case 0x7145:
-        case 0x7146:
-        case 0x7147:
-        case 0x7149:
-        case 0x714A:
-        case 0x714B:
-        case 0x714C:
-        case 0x714D:
-        case 0x714E:
-        case 0x714F:
-        case 0x7151:
-        case 0x7152:
-        case 0x7153:
-        case 0x715E:
-        case 0x715F:
-        case 0x7180:
-        case 0x7181:
-        case 0x7183:
-        case 0x7186:
-        case 0x7187:
-        case 0x7188:
-        case 0x718A:
-        case 0x718B:
-        case 0x718C:
-        case 0x718D:
-        case 0x718F:
-        case 0x7193:
-        case 0x7196:
-        case 0x719B:
-        case 0x719F:
-        case 0x7200:
-        case 0x7210:
-        case 0x7211:
-            caps->family = CHIP_FAMILY_RV515;
-            caps->num_vert_fpus = 2;
-            caps->is_r500 = TRUE;
-            caps->hiz_ram = R300_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x71C0:
-        case 0x71C1:
-        case 0x71C2:
-        case 0x71C3:
-        case 0x71C4:
-        case 0x71C5:
-        case 0x71C6:
-        case 0x71C7:
-        case 0x71CD:
-        case 0x71CE:
-        case 0x71D2:
-        case 0x71D4:
-        case 0x71D5:
-        case 0x71D6:
-        case 0x71DA:
-        case 0x71DE:
-            caps->family = CHIP_FAMILY_RV530;
-            caps->num_vert_fpus = 5;
-            caps->is_r500 = TRUE;
-            caps->hiz_ram = RV530_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x7240:
-        case 0x7243:
-        case 0x7244:
-        case 0x7245:
-        case 0x7246:
-        case 0x7247:
-        case 0x7248:
-        case 0x7249:
-        case 0x724A:
-        case 0x724B:
-        case 0x724C:
-        case 0x724D:
-        case 0x724E:
-        case 0x724F:
-        case 0x7284:
-            caps->family = CHIP_FAMILY_R580;
-            caps->num_vert_fpus = 8;
-            caps->is_r500 = TRUE;
-            caps->hiz_ram = RV530_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x7280:
-            caps->family = CHIP_FAMILY_RV570;
-            caps->num_vert_fpus = 8;
-            caps->is_r500 = TRUE;
-            caps->hiz_ram = RV530_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
-
-        case 0x7281:
-        case 0x7283:
-        case 0x7287:
-        case 0x7288:
-        case 0x7289:
-        case 0x728B:
-        case 0x728C:
-        case 0x7290:
-        case 0x7291:
-        case 0x7293:
-        case 0x7297:
-            caps->family = CHIP_FAMILY_RV560;
-            caps->num_vert_fpus = 8;
-            caps->is_r500 = TRUE;
-            caps->hiz_ram = RV530_HIZ_LIMIT;
-            caps->zmask_ram = PIPE_ZMASK_SIZE;
-            break;
+    default:
+        fprintf(stderr, "r300: Warning: Unknown chipset 0x%x\nAborting...",
+                caps->pci_id);
+        abort();
+    }
 
-        default:
-            fprintf(stderr, "r300: Warning: Unknown chipset 0x%x\n",
-                    caps->pci_id);
+    /* Defaults. */
+    caps->high_second_pipe = FALSE;
+    caps->num_vert_fpus = 0;
+    caps->hiz_ram = 0;
+    caps->zmask_ram = 0;
+
+
+    switch (caps->family) {
+    case CHIP_FAMILY_R300:
+    case CHIP_FAMILY_R350:
+        caps->high_second_pipe = TRUE;
+        caps->num_vert_fpus = 4;
+        caps->hiz_ram = R300_HIZ_LIMIT;
+        caps->zmask_ram = PIPE_ZMASK_SIZE;
+        break;
+
+    case CHIP_FAMILY_RV350:
+    case CHIP_FAMILY_RV370:
+        caps->high_second_pipe = TRUE;
+        caps->num_vert_fpus = 2;
+        caps->zmask_ram = RV3xx_ZMASK_SIZE;
+        break;
+
+    case CHIP_FAMILY_RV380:
+        caps->high_second_pipe = TRUE;
+        caps->num_vert_fpus = 2;
+        caps->hiz_ram = R300_HIZ_LIMIT;
+        caps->zmask_ram = RV3xx_ZMASK_SIZE;
+        break;
+
+    case CHIP_FAMILY_RS400:
+    case CHIP_FAMILY_RS600:
+    case CHIP_FAMILY_RS690:
+    case CHIP_FAMILY_RS740:
+        break;
+
+    case CHIP_FAMILY_RC410:
+    case CHIP_FAMILY_RS480:
+        caps->zmask_ram = RV3xx_ZMASK_SIZE;
+        break;
+
+    case CHIP_FAMILY_R420:
+    case CHIP_FAMILY_R423:
+    case CHIP_FAMILY_R430:
+    case CHIP_FAMILY_R480:
+    case CHIP_FAMILY_R481:
+    case CHIP_FAMILY_RV410:
+        caps->num_vert_fpus = 6;
+        caps->hiz_ram = R300_HIZ_LIMIT;
+        caps->zmask_ram = PIPE_ZMASK_SIZE;
+        break;
+
+    case CHIP_FAMILY_R520:
+        caps->num_vert_fpus = 8;
+        caps->hiz_ram = R300_HIZ_LIMIT;
+        caps->zmask_ram = PIPE_ZMASK_SIZE;
+        break;
+
+    case CHIP_FAMILY_RV515:
+        caps->num_vert_fpus = 2;
+        caps->hiz_ram = R300_HIZ_LIMIT;
+        caps->zmask_ram = PIPE_ZMASK_SIZE;
+        break;
+
+    case CHIP_FAMILY_RV530:
+        caps->num_vert_fpus = 5;
+        caps->hiz_ram = RV530_HIZ_LIMIT;
+        caps->zmask_ram = PIPE_ZMASK_SIZE;
+        break;
+
+    case CHIP_FAMILY_R580:
+    case CHIP_FAMILY_RV560:
+    case CHIP_FAMILY_RV570:
+        caps->num_vert_fpus = 8;
+        caps->hiz_ram = RV530_HIZ_LIMIT;
+        caps->zmask_ram = PIPE_ZMASK_SIZE;
+        break;
     }
 
+    caps->num_tex_units = 16;
+    caps->is_r400 = caps->family >= CHIP_FAMILY_R420 && caps->family < CHIP_FAMILY_RV515;
+    caps->is_r500 = caps->family >= CHIP_FAMILY_RV515;
     caps->is_rv350 = caps->family >= CHIP_FAMILY_RV350;
     caps->z_compress = caps->is_rv350 ? R300_ZCOMP_8X8 : R300_ZCOMP_4X4;
     caps->dxtc_swizzle = caps->is_r400 || caps->is_r500;
     caps->has_us_format = caps->family == CHIP_FAMILY_R520;
+    caps->has_tcl = caps->num_vert_fpus > 0;
+
+    if (caps->has_tcl) {
+        caps->has_tcl = debug_get_bool_option("RADEON_NO_TCL", FALSE) ? FALSE : TRUE;
+    }
 }
diff --git a/src/gallium/drivers/r300/r300_chipset.h b/src/gallium/drivers/r300/r300_chipset.h
index d0050bed2e8..4df6b5b6292 100644
--- a/src/gallium/drivers/r300/r300_chipset.h
+++ b/src/gallium/drivers/r300/r300_chipset.h
@@ -96,26 +96,24 @@ struct r300_capabilities {
 
 /* Enumerations for legibility and telling which card we're running on. */
 enum {
-    CHIP_FAMILY_R300 = 0,
+    CHIP_FAMILY_R300 = 0, /* R3xx-based cores. */
     CHIP_FAMILY_R350,
-    CHIP_FAMILY_R360,
     CHIP_FAMILY_RV350,
     CHIP_FAMILY_RV370,
     CHIP_FAMILY_RV380,
-    CHIP_FAMILY_R420,
+    CHIP_FAMILY_RS400,
+    CHIP_FAMILY_RC410,
+    CHIP_FAMILY_RS480,
+    CHIP_FAMILY_R420,     /* R4xx-based cores. */
     CHIP_FAMILY_R423,
     CHIP_FAMILY_R430,
     CHIP_FAMILY_R480,
     CHIP_FAMILY_R481,
     CHIP_FAMILY_RV410,
-    CHIP_FAMILY_RS400,
-    CHIP_FAMILY_RC410,
-    CHIP_FAMILY_RS480,
-    CHIP_FAMILY_RS482,
     CHIP_FAMILY_RS600,
     CHIP_FAMILY_RS690,
     CHIP_FAMILY_RS740,
-    CHIP_FAMILY_RV515,
+    CHIP_FAMILY_RV515,    /* R5xx-based cores. */
     CHIP_FAMILY_R520,
     CHIP_FAMILY_RV530,
     CHIP_FAMILY_R580,
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index 240b841ed2a..05af2148b38 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -49,20 +49,18 @@ static const char* r300_get_vendor(struct pipe_screen* pscreen)
 static const char* chip_families[] = {
     "ATI R300",
     "ATI R350",
-    "ATI R360",
     "ATI RV350",
     "ATI RV370",
     "ATI RV380",
+    "ATI RS400",
+    "ATI RC410",
+    "ATI RS480",
     "ATI R420",
     "ATI R423",
     "ATI R430",
     "ATI R480",
     "ATI R481",
     "ATI RV410",
-    "ATI RS400",
-    "ATI RC410",
-    "ATI RS480",
-    "ATI RS482",
     "ATI RS600",
     "ATI RS690",
     "ATI RS740",
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index 04499c78cc6..121409b2260 100644
--- a/src/gallium/drivers/r300/r300_state_derived.c
+++ b/src/gallium/drivers/r300/r300_state_derived.c
@@ -438,7 +438,7 @@ static void r300_update_rs_block(struct r300_context *r300)
 
     /* Rasterize texture coordinates. */
     for (i = 0; i < ATTR_GENERIC_COUNT && tex_count < 8; i++) {
-	bool sprite_coord = false;
+	boolean sprite_coord = false;
 
 	if (fs_inputs->generic[i] != ATTR_UNUSED) {
 	    sprite_coord = !!(r300->sprite_coord_enable & (1 << i));