r300/compiler: allow 32 temporaries in vertex shaders

diff --git a/src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c b/src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c
index 6a1e3e75a6873f88bab8bfb3b2bb582f19cf62d9..5f66ad82856940fef9ab9338039651bc0acd737d 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c
+++ b/src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c
@@ -405,7 +405,7 @@ static void allocate_temporary_registers(struct r300_vertex_program_compiler * c
 {
        struct rc_instruction *inst;
        unsigned int num_orig_temps = 0;
-       char hwtemps[VSF_MAX_FRAGMENT_TEMPS];
+       char hwtemps[R300_VS_MAX_TEMPS];
        struct temporary_allocation * ta;
        unsigned int i, j;
 
@@ -464,11 +464,11 @@ static void allocate_temporary_registers(struct r300_vertex_program_compiler * c
                                unsigned int orig = inst->U.I.DstReg.Index;
 
                                if (!ta[orig].Allocated) {
-                                       for(j = 0; j < VSF_MAX_FRAGMENT_TEMPS; ++j) {
+                                       for(j = 0; j < R300_VS_MAX_TEMPS; ++j) {
                                                if (!hwtemps[j])
                                                        break;
                                        }
-                                       if (j >= VSF_MAX_FRAGMENT_TEMPS) {
+                                       if (j >= R300_VS_MAX_TEMPS) {
                                                fprintf(stderr, "Out of hw temporaries\n");
                                        } else {
                                                ta[orig].Allocated = 1;

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_code.h b/src/mesa/drivers/dri/r300/compiler/radeon_code.h
index 1979e7e4e49707f79c5549207dfe63acb82adb5a..7550fcaa2e612e7ebd13c57fe214766b95e1a4f9 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_code.h
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_code.h
@@ -236,7 +236,7 @@ struct rX00_fragment_program_code {
 
 
 #define VSF_MAX_FRAGMENT_LENGTH (255*4)
-#define VSF_MAX_FRAGMENT_TEMPS (14)
+#define R300_VS_MAX_TEMPS      32
 
 #define VSF_MAX_INPUTS 32
 #define VSF_MAX_OUTPUTS 32