diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2014-10-09 11:00:32 +0200 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-11-10 04:25:39 -0800 |
| commit | 5b9cf337b451a1229a3abc30aeb9c15393c8462c (patch) | |
| tree | 47e80c163f347d9cdefd2c28b29d92ac47074684 /src/mesa/main/uniforms.h | |
| parent | d388d8576f004cbc6e659ab7e7b0e9af938f7068 (diff) | |
| download | external_mesa3d-5b9cf337b451a1229a3abc30aeb9c15393c8462c.zip external_mesa3d-5b9cf337b451a1229a3abc30aeb9c15393c8462c.tar.gz external_mesa3d-5b9cf337b451a1229a3abc30aeb9c15393c8462c.tar.bz2 | |
mesa/main: Pass the data that _mesa_uniform actually wants
The GL_ enums were previously used because glsl_types.h couldn't be used
in C code. That was fixed some time ago (and uniforms.c already
includes glsl_types.h), so this is no longer necessary.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Diffstat (limited to 'src/mesa/main/uniforms.h')
| -rw-r--r-- | src/mesa/main/uniforms.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index 6575a52..0a9ee7d 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -265,7 +265,9 @@ _mesa_get_uniform_location(struct gl_shader_program *shProg, void _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shader_program, GLint location, GLsizei count, - const GLvoid *values, GLenum type); + const GLvoid *values, + enum glsl_base_type basicType, + unsigned src_components); void _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg, |