summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-02-24 14:40:21 +0100
committerSamuel Pitoiset <[email protected]>2017-02-27 19:41:14 +0100
commit08a052966fff77b1d3c04f0b75fb1199988ba1fd (patch)
tree519d658ebc0056f302b6737e8ee5cd659b8441ce /src/mesa/main
parente12f4edf9ce69ff76d4c81b1cebd6e2d4934f3c5 (diff)
glsl: use is_sampler() anywhere it's possible
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/uniform_query.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 010a7b24b1b..4d06313565f 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -355,7 +355,7 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
&&
(uni->type->base_type == GLSL_TYPE_INT
|| uni->type->base_type == GLSL_TYPE_UINT
- || uni->type->base_type == GLSL_TYPE_SAMPLER
+ || uni->type->is_sampler()
|| uni->type->is_image()))
|| ((returnType == GLSL_TYPE_UINT64 ||
returnType == GLSL_TYPE_INT64 ) &&