define and use MAX_PROGRAM_ADDRESS_REGS

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 82ea72a59d0752d70dbcb48d49036b9bccbacbb0..00df084fc881a935952cd1f34b4339e10d403f16 100644 (file)
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -201,6 +201,7 @@
 #define MAX_PROGRAM_MATRIX_STACK_DEPTH 4
 #define MAX_PROGRAM_CALL_DEPTH 8
 #define MAX_PROGRAM_TEMPS 128
+#define MAX_PROGRAM_ADDRESS_REGS 2
 #define MAX_UNIFORMS 128
 #define MAX_VARYING 8
 /*@}*/

diff --git a/src/mesa/shader/prog_execute.h b/src/mesa/shader/prog_execute.h
index 0f4956d6ee386228bf24ccc430a16c9a201c62dd..47845e9111ff347ad0d8a5cb4542362765a4fc5a 100644 (file)
--- a/src/mesa/shader/prog_execute.h
+++ b/src/mesa/shader/prog_execute.h
@@ -57,7 +57,7 @@ struct gl_program_machine
    GLfloat Outputs[MAX_PROGRAM_OUTPUTS][4];
    GLfloat (*EnvParams)[4]; /**< Vertex or Fragment env parameters */
    GLuint CondCodes[4];  /**< COND_* value for x/y/z/w */
-   GLint AddressReg[MAX_VERTEX_PROGRAM_ADDRESS_REGS][4];
+   GLint AddressReg[MAX_PROGRAM_ADDRESS_REGS][4];
 
    GLuint CallStack[MAX_PROGRAM_CALL_DEPTH]; /**< For CAL/RET instructions */
    GLuint StackDepth; /**< Index/ptr to top of CallStack[] */