glsl: make sampler/image scalar types

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 <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>

diff --git a/src/compiler/glsl_types.h b/src/compiler/glsl_types.h
index a81b8fe7dc2c168312480bcc2b03292bc9c17e04..04490872385303c420750859de6c5c7382f71464 100644 (file)
--- 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);
    }
 
    /**