diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-05 08:28:03 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-05 08:28:03 +0100 |
| commit | f6023b333a7fec1691bfb2757ba7615a15196a81 (patch) | |
| tree | 17e7b1b021478ef2c470bf8202f144be04c4fea8 /mesalib/src/mesa/main/uniforms.h | |
| parent | e4326f248054c0276b6e9136cd48e782e42c2644 (diff) | |
| parent | 76c527be60066b647468ad66f8e4d7dd18fa1769 (diff) | |
| download | vcxsrv-f6023b333a7fec1691bfb2757ba7615a15196a81.tar.gz vcxsrv-f6023b333a7fec1691bfb2757ba7615a15196a81.tar.bz2 vcxsrv-f6023b333a7fec1691bfb2757ba7615a15196a81.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xkeyboard-config git update 5 feb 2013
Diffstat (limited to 'mesalib/src/mesa/main/uniforms.h')
| -rw-r--r-- | mesalib/src/mesa/main/uniforms.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/uniforms.h b/mesalib/src/mesa/main/uniforms.h index f17503121..a12ad9b36 100644 --- a/mesalib/src/mesa/main/uniforms.h +++ b/mesalib/src/mesa/main/uniforms.h @@ -167,6 +167,10 @@ _mesa_GetActiveUniformsiv(GLuint program, void GLAPIENTRY _mesa_GetUniformiv(GLhandleARB, GLint, GLint *); +long +_mesa_parse_program_resource_name(const GLchar *name, + const GLchar **out_base_name_end); + unsigned _mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg, const GLchar *name, unsigned *offset); |