Up MAX_AOS_ARRAYS to 16. Do we need more?

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index 723bee7548a8351d145150a3751b9ad118ed7d0f..ab6660897ca67b4724f5e84e9a78dda9d04d0c4b 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -727,7 +727,7 @@ struct r300_pixel_shader_state {
 #endif // USE_ARB_F_P
 
 /* 8 is somewhat bogus... it is probably something like 24 */
-#define R300_MAX_AOS_ARRAYS            8
+#define R300_MAX_AOS_ARRAYS            16
 
 #define AOS_FORMAT_FLOAT       1
 #define AOS_FORMAT_UBYTE       2

diff --git a/src/mesa/drivers/dri/r300/r300_reg.h b/src/mesa/drivers/dri/r300/r300_reg.h
index 0beef346793d1627f42ca97d7b988b67e66350d7..7b9fd1c9553d350ffb939566b88ef97e8add1b99 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_reg.h
+++ b/src/mesa/drivers/dri/r300/r300_reg.h
@@ -124,6 +124,10 @@ I am fairly certain that they are correct unless stated otherwise in comments.
 #define R300_VAP_INPUT_ROUTE_0_1            0x2154
 #define R300_VAP_INPUT_ROUTE_0_2            0x2158
 #define R300_VAP_INPUT_ROUTE_0_3            0x215C
+#define R300_VAP_INPUT_ROUTE_0_4            0x2160
+#define R300_VAP_INPUT_ROUTE_0_5            0x2164
+#define R300_VAP_INPUT_ROUTE_0_6            0x2168
+#define R300_VAP_INPUT_ROUTE_0_7            0x216C
 
 /* gap */
 /* Notes:
@@ -168,6 +172,10 @@ I am fairly certain that they are correct unless stated otherwise in comments.
 #define R300_VAP_INPUT_ROUTE_1_1            0x21E4
 #define R300_VAP_INPUT_ROUTE_1_2            0x21E8
 #define R300_VAP_INPUT_ROUTE_1_3            0x21EC
+#define R300_VAP_INPUT_ROUTE_1_4            0x21F0
+#define R300_VAP_INPUT_ROUTE_1_5            0x21F4
+#define R300_VAP_INPUT_ROUTE_1_6            0x21F8
+#define R300_VAP_INPUT_ROUTE_1_7            0x21FC
 
 /* END */