diff options
| author | Brian <[email protected]> | 2007-04-18 16:27:35 -0600 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-04-18 17:14:13 -0600 |
| commit | c93e883b205a679aa80f6228459890f9118ad909 (patch) | |
| tree | f9e8290d6c013e7e3086a8c53bf436fe33c57824 /src/mesa/shader/prog_parameter.h | |
| parent | 274ac7a801766a0ae766219ec6a40ed52e479d07 (diff) | |
Start fixing some issues with uniform variables and their types.
Diffstat (limited to 'src/mesa/shader/prog_parameter.h')
| -rw-r--r-- | src/mesa/shader/prog_parameter.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/shader/prog_parameter.h b/src/mesa/shader/prog_parameter.h index 2e0feb972ec..09ff851ea73 100644 --- a/src/mesa/shader/prog_parameter.h +++ b/src/mesa/shader/prog_parameter.h @@ -46,6 +46,7 @@ struct gl_program_parameter { const char *Name; /**< Null-terminated string */ enum 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) */ /** * A sequence of STATE_* tokens and integers to identify GL state. @@ -80,7 +81,7 @@ _mesa_clone_parameter_list(const struct gl_program_parameter_list *list); extern GLint _mesa_add_parameter(struct gl_program_parameter_list *paramList, enum register_file type, const char *name, - GLuint size, const GLfloat *values, + GLuint size, GLenum datatype, const GLfloat *values, const gl_state_index state[STATE_LENGTH]); extern GLint @@ -99,11 +100,11 @@ _mesa_add_unnamed_constant(struct gl_program_parameter_list *paramList, extern GLint _mesa_add_uniform(struct gl_program_parameter_list *paramList, - const char *name, GLuint size); + const char *name, GLuint size, GLenum datatype); extern GLint _mesa_add_sampler(struct gl_program_parameter_list *paramList, - const char *name); + const char *name, GLenum datatype); extern GLint _mesa_add_varying(struct gl_program_parameter_list *paramList, |