added MAX_PROGRAM_ENV_PARAMS

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index d779860f114fb4f2019927767f34c3697251d491..82ea72a59d0752d70dbcb48d49036b9bccbacbb0 100644 (file)
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -196,6 +196,7 @@
 /** For any program target/extension */
 /*@{*/
 #define MAX_PROGRAM_LOCAL_PARAMS 128 /* KW: power of two */
+#define MAX_PROGRAM_ENV_PARAMS 128
 #define MAX_PROGRAM_MATRICES 8
 #define MAX_PROGRAM_MATRIX_STACK_DEPTH 4
 #define MAX_PROGRAM_CALL_DEPTH 8

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index ce58154a0af836df382ff7df20e5bbd94ae93c78..b83beb8f91f45804d5f887e77b7bf9ee9ef741eb 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1934,11 +1934,11 @@ struct gl_vertex_program_state
    /** Currently enabled and valid program (including internal programs) */
    struct gl_vertex_program *_Current;
 
-   GLfloat Parameters[MAX_NV_VERTEX_PROGRAM_PARAMS][4]; /**< Env params */
+   GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */
 
    /* For GL_NV_vertex_program only: */
-   GLenum TrackMatrix[MAX_NV_VERTEX_PROGRAM_PARAMS / 4];
-   GLenum TrackMatrixTransform[MAX_NV_VERTEX_PROGRAM_PARAMS / 4];
+   GLenum TrackMatrix[MAX_PROGRAM_ENV_PARAMS / 4];
+   GLenum TrackMatrixTransform[MAX_PROGRAM_ENV_PARAMS / 4];
 
    /** Should fixed-function T&L be implemented with a vertex prog? */
    GLboolean _MaintainTnlProgram;
@@ -1967,7 +1967,7 @@ struct gl_fragment_program_state
    /** Currently enabled and valid program (including internal programs) */
    struct gl_fragment_program *_Current;
 
-   GLfloat Parameters[MAX_NV_FRAGMENT_PROGRAM_PARAMS][4]; /**< Env params */
+   GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */
 
    /** Should fixed-function texturing be implemented with a fragment prog? */
    GLboolean _MaintainTexEnvProgram;