From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 26 Apr 2017 14:02:32 +0000 (+0200)
Subject: glsl: make sampler/image scalar types
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c618f31065d9e9d0e19afab7de8202ef609a731d;p=mesa.git

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 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);
    }
 
    /**