diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-22 18:18:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-22 18:18:58 +0000 |
| commit | 3b79162ea5c5be078326f2e0ea85b0f84c02f166 (patch) | |
| tree | 6826d1ef026f16ec12d35ee6bd4a892d0a05b7e0 /mesalib/src/mesa/shader/prog_parameter.h | |
| parent | 4284aeba874b9168f2228c59639bec8346a56796 (diff) | |
| parent | b729d9e1cc1c60e415da24143cabcbaccb525ed7 (diff) | |
| download | vcxsrv-3b79162ea5c5be078326f2e0ea85b0f84c02f166.tar.gz vcxsrv-3b79162ea5c5be078326f2e0ea85b0f84c02f166.tar.bz2 vcxsrv-3b79162ea5c5be078326f2e0ea85b0f84c02f166.zip | |
svn merge ^/branches/released
Diffstat (limited to 'mesalib/src/mesa/shader/prog_parameter.h')
| -rw-r--r-- | mesalib/src/mesa/shader/prog_parameter.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mesalib/src/mesa/shader/prog_parameter.h b/mesalib/src/mesa/shader/prog_parameter.h index d1fcf47e6..699cb0c73 100644 --- a/mesalib/src/mesa/shader/prog_parameter.h +++ b/mesalib/src/mesa/shader/prog_parameter.h @@ -56,7 +56,13 @@ struct gl_program_parameter const char *Name; /**< Null-terminated string */ gl_register_file Type; /**< PROGRAM_NAMED_PARAM, CONSTANT or STATE_VAR */ GLenum DataType; /**< GL_FLOAT, GL_FLOAT_VEC2, etc */ - GLuint Size; /**< Number of components (1..4) */ + /** + * Number of components (1..4), or more. + * If the number of components is greater than 4, + * this parameter is part of a larger uniform like a GLSL matrix or array. + * The next program parameter's Size will be Size-4 of this parameter. + */ + GLuint Size; GLboolean Used; /**< Helper flag for GLSL uniform tracking */ GLboolean Initialized; /**< Has the ParameterValue[] been set? */ GLbitfield Flags; /**< Bitmask of PROG_PARAM_*_BIT */ |