From 784d3a70669e57a469614ff4c60339f770a5152a Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 30 Mar 2017 00:33:15 +0200 Subject: [PATCH] glsl: allow glsl_type::sampler_index() with images MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Samuel Pitoiset Reviewed-by: Timothy Arceri Reviewed-by: Nicolai Hähnle --- 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 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: -- 2.30.2