diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
| commit | 1e90ede4237374dfbb2c8c506a906233bcfd3c5d (patch) | |
| tree | 13b59b0ab2715fd0bb9eea788c73b08f3b07c01e /mesalib/src/mesa/main/uniforms.h | |
| parent | baf98f9bb36f956245d83ecd04f90625d6d68d2b (diff) | |
| parent | 9f986778bd4393c5a9108426969d45aa7f10f334 (diff) | |
| download | vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.gz vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.bz2 vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/os.h
Diffstat (limited to 'mesalib/src/mesa/main/uniforms.h')
| -rw-r--r-- | mesalib/src/mesa/main/uniforms.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/uniforms.h b/mesalib/src/mesa/main/uniforms.h index b024cb30b..77f55d47d 100644 --- a/mesalib/src/mesa/main/uniforms.h +++ b/mesalib/src/mesa/main/uniforms.h @@ -191,6 +191,9 @@ _mesa_update_shader_textures_used(struct gl_program *prog); extern void _mesa_init_shader_uniform_dispatch(struct _glapi_table *exec); +extern const struct gl_program_parameter * +get_uniform_parameter(struct gl_shader_program *shProg, GLint index); + struct gl_builtin_uniform_element { const char *field; int tokens[STATE_LENGTH]; |