[Mesa-dev] [PATCH] glsl: allow glsl_type::sampler_index() with images

[Nicolai Hähnle]

On 30.03.2017 00:33, Samuel Pitoiset wrote:
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

Maybe some of those names should be changed to reflect the dual use? 
Anyway, this patch is

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

> ---
>  src/compiler/glsl_types.cpp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp
> index 405aa3679a..cf0fe71d1a 100644
> --- a/src/compiler/glsl_types.cpp
> +++ b/src/compiler/glsl_types.cpp
> @@ -315,7 +315,7 @@ glsl_type::sampler_index() const
>  {
>     const glsl_type *const t = (this->is_array()) ? this->fields.array : this;
>
> -   assert(t->is_sampler());
> +   assert(t->is_sampler() || t->is_image());
>
>     switch (t->sampler_dimensionality) {
>     case GLSL_SAMPLER_DIM_1D:
>


-- 
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.