diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2014-10-10 15:29:31 +0200 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-11-10 04:25:39 -0800 |
| commit | 9c38d4db520a26fea26e404d8022c6ca2d954658 (patch) | |
| tree | 5b8c1862bca7ce2241c746f8f18ce824dc2fb451 /src/mesa/main/uniform_query.cpp | |
| parent | 5b9cf337b451a1229a3abc30aeb9c15393c8462c (diff) | |
| download | external_mesa3d-9c38d4db520a26fea26e404d8022c6ca2d954658.zip external_mesa3d-9c38d4db520a26fea26e404d8022c6ca2d954658.tar.gz external_mesa3d-9c38d4db520a26fea26e404d8022c6ca2d954658.tar.bz2 | |
mesa: Remove GLSL_TYPE_SAMPLER check
Noting the assertion just a few lines earlier, returnType cannot be
GLSL_TYPE_SAMPLER.
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/uniform_query.cpp')
| -rw-r--r-- | src/mesa/main/uniform_query.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 77217cb..aefa8b8 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -342,8 +342,7 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location, */ if (returnType == uni->type->base_type || ((returnType == GLSL_TYPE_INT - || returnType == GLSL_TYPE_UINT - || returnType == GLSL_TYPE_SAMPLER) + || returnType == GLSL_TYPE_UINT) && (uni->type->base_type == GLSL_TYPE_INT || uni->type->base_type == GLSL_TYPE_UINT |