diff options
| author | Ian Romanick <[email protected]> | 2015-08-31 18:30:48 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2015-09-02 16:24:17 -0700 |
| commit | a6976f09727014730f45ec27c714c6a8140e074a (patch) | |
| tree | dd8911817d5c328ab4e946dce54fff6e4b14fc70 /src/mesa/main/uniforms.h | |
| parent | 882aab00abb226c103b8c6fe514247334b4d2d04 (diff) | |
mesa: Pass the type to _mesa_uniform_matrix as a glsl_base_type
This matches _mesa_uniform, and it enables the bug fix in the next
patch.
v2: s/type/basicType/ in the assert in _mesa_uniform_matrix.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]> [v1]
Cc: Dave Airlie <[email protected]>
Cc: "10.6 11.0" <[email protected]>
Diffstat (limited to 'src/mesa/main/uniforms.h')
| -rw-r--r-- | src/mesa/main/uniforms.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index e62eaa53ccc..c3c9c1e7dd8 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -355,7 +355,7 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg, GLuint cols, GLuint rows, GLint location, GLsizei count, GLboolean transpose, - const GLvoid *values, GLenum type); + const GLvoid *values, enum glsl_base_type basicType); void _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location, |