From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 29 Mar 2017 22:33:15 +0000 (+0200)
Subject: glsl: allow glsl_type::sampler_index() with images
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=784d3a70669e57a469614ff4c60339f770a5152a;p=mesa.git

glsl: allow glsl_type::sampler_index() with images

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp
index 13e47f76f7a..db65bb0e00d 100644
--- a/src/compiler/glsl_types.cpp
+++ b/src/compiler/glsl_types.cpp
@@ -300,7 +300,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: