aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-03-30 00:33:15 +0200
committerSamuel Pitoiset <[email protected]>2017-03-30 13:15:16 +0200
commit784d3a70669e57a469614ff4c60339f770a5152a (patch)
tree500436f4ba91b1ae2ce76218216935082b1ddb07
parent257ee3f7ef21dfbd65a3dac423a986b926ca0d18 (diff)
glsl: allow glsl_type::sampler_index() with images
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]>
-rw-r--r--src/compiler/glsl_types.cpp2
1 files changed, 1 insertions, 1 deletions
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: