From c618f31065d9e9d0e19afab7de8202ef609a731d Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 26 Apr 2017 16:02:32 +0200 Subject: [PATCH] glsl: make sampler/image scalar types MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit As a side effect, this will magically fix std140/std430 interfaces for bindless samplers/images and will help for implementing the explicit conversions with constructors. Signed-off-by: Samuel Pitoiset Reviewed-by: Nicolai Hähnle Reviewed-by: Timothy Arceri --- src/compiler/glsl_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/glsl_types.h b/src/compiler/glsl_types.h index a81b8fe7dc2..04490872385 100644 --- a/src/compiler/glsl_types.h +++ b/src/compiler/glsl_types.h @@ -441,7 +441,7 @@ struct glsl_type { { return (vector_elements == 1) && (base_type >= GLSL_TYPE_UINT) - && (base_type <= GLSL_TYPE_BOOL); + && (base_type <= GLSL_TYPE_IMAGE); } /** -- 2.30.2