diff options
| author | Brian <brian@yutani.localnet.net> | 2007-02-22 14:57:19 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-02-22 14:57:19 -0700 |
| commit | b7aeac0de1c9c533f78c5d6acf358bdc206161ab (patch) | |
| tree | 47594c5d5a938218d1f211bf2da611dd72a8eea6 | |
| parent | 79fb4527cad556792f514d9e94e8f623837752ad (diff) | |
added MAX_PROGRAM_ENV_PARAMS
| -rw-r--r-- | src/mesa/main/config.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h index d779860f11..82ea72a59d 100644 --- 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 ce58154a0a..b83beb8f91 100644 --- 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; |