diff options
author | marha <marha@users.sourceforge.net> | 2013-02-05 08:22:00 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-02-05 08:23:51 +0100 |
commit | 76c527be60066b647468ad66f8e4d7dd18fa1769 (patch) | |
tree | 2e4653dc3adf874409cf9baba399fd64537115d4 /mesalib/src/mesa/main/uniforms.h | |
parent | a6d5f8de1394c338d01b65be7dba3520bf8bdf4b (diff) | |
download | vcxsrv-76c527be60066b647468ad66f8e4d7dd18fa1769.tar.gz vcxsrv-76c527be60066b647468ad66f8e4d7dd18fa1769.tar.bz2 vcxsrv-76c527be60066b647468ad66f8e4d7dd18fa1769.zip |
fontconfig mesa xkeyboard-config git update 5 feb 2013
xkeyboard-config commit b4be67b48fb11989f1824dd0b1c8c399430162b0
fontconfig commit 95af7447dba7c54ed162b667c0bb2ea6500e8f32
mesa commit 86536a321d9d26137587affe687a07da71f0b526
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); |